Hide Option Button based on Linked Cell Value

Hi All,

I have a worksheet attached with a code to hide Option Buttons based on cell values. The option buttons and group boxes related to Range E7 does not function.

I linked the option buttons that change cell E7 to link to E8 and was then able to get the functions below based on E7 to function (After changing all E7 values to E8).

Please help. Rev4.xlsm

Private Sub Worksheet_Calculate()

   If Range("E8").Value = 0 Then
        Shapes("Option Button 21").Visible = True
        Shapes("Option Button 23").Visible = True
        Shapes("Group Box 24").Visible = True
        Shapes("Option Button 25").Visible = True
        Shapes("Option Button 26").Visible = True
        Shapes("Group Box 27").Visible = True
        Shapes("Option Button 28").Visible = True
        Shapes("Option Button 29").Visible = True
        Shapes("Option Button 30").Visible = True

   ElseIf Range("E8").Value = 3 Then
        Shapes("Option Button 21").Visible = False
        Shapes("Option Button 23").Visible = True
        Shapes("Group Box 24").Visible = False
        Shapes("Option Button 25").Visible = False
        Shapes("Option Button 26").Visible = False
        Shapes("Group Box 27").Visible = True
        Shapes("Option Button 28").Visible = True
        Shapes("Option Button 29").Visible = True
        Shapes("Option Button 30").Visible = True

   ElseIf Range("E8").Value = 2 Then
        Shapes("Option Button 21").Visible = True
        Shapes("Option Button 23").Visible = False
        Shapes("Group Box 24").Visible = False
        Shapes("Option Button 25").Visible = False
        Shapes("Option Button 26").Visible = False
        Shapes("Group Box 27").Visible = False
        Shapes("Option Button 28").Visible = False
        Shapes("Option Button 29").Visible = False
        Shapes("Option Button 30").Visible = False

   ElseIf Range("E8").Value = 1 Then
        Shapes("Option Button 21").Visible = True
        Shapes("Option Button 23").Visible = False
        Shapes("Group Box 24").Visible = True
        Shapes("Option Button 25").Visible = True
        Shapes("Option Button 26").Visible = True
        Shapes("Group Box 27").Visible = False
        Shapes("Option Button 28").Visible = False
        Shapes("Option Button 29").Visible = False
        Shapes("Option Button 30").Visible = False

   End If

   If Range("E7").Value = 0 Then
        Shapes("Option Button 69").Visible = True
        Shapes("Option Button 70").Visible = True
        Shapes("Group Box 68").Visible = True

   ElseIf Range("E7").Value = 1 Then
        Shapes("Option Button 69").Visible = False
        Shapes("Option Button 70").Visible = False
        Shapes("Group Box 68").Visible = False
                
   ElseIf Range("E7").Value = 2 Then
        Shapes("Option Button 69").Visible = True
        Shapes("Option Button 70").Visible = True
        Shapes("Group Box 68").Visible = True
        
   ElseIf Range("E7").Value = 3 Then
        Shapes("Option Button 69").Visible = True
        Shapes("Option Button 70").Visible = True
        Shapes("Group Box 68").Visible = True


   End If
End Sub