Grouper / Dissocier si "oui" dans une cellule

Private Sub Workbook_Open()
  Sheets("Sheet1").Range("h:m").EntireColumn.Hidden = UCase(Sheets("Sheet1").Range("B2")) = "OUI"
  Sheets("Sheet1").Range("e:e").EntireColumn.Hidden = UCase(Sheets("Sheet1").Range("B3")) = "OUI"
End Sub

Private Sub Worksheet_Change(ByVal Target As Range)
  If Target.Count = 1 Then
    If Target.Address(0, 0) = "B2" Then Range("h:m").EntireColumn.Hidden = UCase(Target) = "OUI"
    If Target.Address(0, 0) = "B3" Then Range("e:e").EntireColumn.Hidden = UCase(Target) = "OUI"
  End If
End Sub

Dim espion As Boolean 'mémorise la variable

Private Sub Worksheet_Calculate()
Application.OnTime 1, Me.CodeName & ".Analyse"
End Sub

Private Sub Worksheet_Change(ByVal Target As Range)
espion = True
End Sub

Sub Analyse()
Application.EnableEvents = False
If espion Then
    Columns("H:M").Hidden = UCase([B2]) = "OUI"
    Columns("E:E").Hidden = UCase([B3]) = "OUI"
    espion = False
Else
    [B2] = IIf(Columns("H:M").Hidden, "Oui", "Non")
    [B3] = IIf(Columns("E").Hidden, "Oui", "Non")
End If
Application.EnableEvents = True
End Sub