diff --git a/guiheader.py b/guiheader.py
index 0e76a56..cb8826e 100644
--- a/guiheader.py
+++ b/guiheader.py
@@ -302,13 +302,6 @@ class GUIHeader(QWidget):
         self.master_to_wgt = {"Gantry 1": "G1", "Gantry 2": "G2",
                               "Gantry 3": "G3", "OPTIS2": "O2", "PIF": "PIF"}
 
-        self.toG1("OFF")
-        self.toBMA1("OFF")
-        self.toG3("OFF")
-        self.toPIF("OFF")
-        self.toO2("OFF")
-        self.toG2("OFF")
-
         # previously in src/gui.py of client HLA
 
         self.sector_disruptor_dict = {}
@@ -335,6 +328,16 @@ class GUIHeader(QWidget):
         except KeyError as ex:
             print("KeyError: {0}".format(str(ex)))
 
+
+        self.toG1("OFF")
+        self.toBMA1("OFF")
+        self.toG3("OFF")
+        self.toPIF("OFF")
+        self.toO2("OFF")
+        self.toG2("OFF")
+
+            
+            
         def receive_master_update(value, status, alarm_severity):
 
             self.mastership = value
@@ -360,7 +363,7 @@ class GUIHeader(QWidget):
                     wgt_val].trigger_monitor_str.emit(
                         self.sector_disruptor_dict[wgt_val], 1, 0)
             #self.toPIF("ON")
-            #self.toG3("ON")
+            #self.toG1("ON")
 
         def enable_disable_beamline(sect, sector_line, value):
 
@@ -390,6 +393,7 @@ class GUIHeader(QWidget):
                     self.toG1(action)
                     if action == "ON":
                         self.toSH("OFF")
+                        
                 elif sector == "G2":
                     self.toG2(action)
                     reset_check_mini_post_sh()
@@ -496,8 +500,9 @@ class GUIHeader(QWidget):
         color = "green" if on_off == "ON" else self.pf_bgcolor()
         for key, pf in self.pframe_matrix["G1"][3].items():
             pf.setStyleSheet("background-color:{0};".format(color))
+            
         for key, pf in self.pframe_matrix["PRE-SH"][3].items():
-            pf.setStyleSheet("background-color:{0};".format(color))
+            pf.setStyleSheet("background-color:{0};".format(color))         
         for i in range(3, 12):
             pf = self.pframe_matrix["POST-BMA1"][15-i][i]
             pf.setStyleSheet("background-color:{0};".format(color))
@@ -505,16 +510,26 @@ class GUIHeader(QWidget):
         #    pf = self.pframe_matrix["POST-BMA1"][3][i]
         #    pf.setStyleSheet("background-color:{0};".format(color))
 
+        #if self.sector_disruptor_dict["G1"] != "Geschlossen":
+        #    self.toBMA1("ON")
+        #    self.afterBMA1("ON")
+        #else:
         self.toBMA1(on_off)
         self.afterBMA1(on_off)
 
     def afterBMA1(self, on_off: str = "ON"):
+        if self.sector_disruptor_dict["G1"] != "Geschlossen":
+             on_off = "ON"
+        
         color = "green" if on_off == "ON" else self.pf_bgcolor()
         for i in range(0, 3):
             pf = self.pframe_matrix["POST-BMA1"][13][i]
             pf.setStyleSheet("background-color:{0};".format(color))
 
     def toBMA1(self, on_off: str = "ON"):
+        if self.sector_disruptor_dict["G1"] != "Geschlossen":
+             on_off = "ON"
+             
         color = "green" if on_off == "ON" else self.pf_bgcolor()
         for key, pf in self.pframe_matrix["POST-COMET"][8].items():
             pf.setStyleSheet("background-color:{0};".format(color))
@@ -550,10 +565,17 @@ class GUIHeader(QWidget):
 
         #for key, pf in self.pframe_matrix["O2"][11].items():
         #    pf.setStyleSheet("background-color:{0};".format(color))
-            
+
+       
+        
         for key, pf in self.pframe_matrix["PRE-PIF"][3].items():
             pf.setStyleSheet("background-color:{0};".format(color))
 
+        amd2 = self.cafe.getCache("AMD2:SOL:2")
+        
+        if amd2 is not None and amd2 > 0.0:
+            color = "green"
+                  
         for i in range(5, 8):
             pf = self.pframe_matrix["O2"][5][i]
             pf.setStyleSheet("background-color:{0};".format(color))
@@ -568,12 +590,10 @@ class GUIHeader(QWidget):
         pf = self.pframe_matrix["O2"][10][0]
         pf.setStyleSheet("background-color:{0};".format(color))    
 
-        
         self.toSHOverlap(on_off)
         self.afterBMA1(on_off)
 
     def toO2(self, on_off: str = "ON"):
-
         color = "green" if on_off == "ON" else self.pf_bgcolor()
         for key, pf in self.pframe_matrix["POST-SH"][8].items():
             pf.setStyleSheet("background-color:{0};".format(color))
@@ -587,7 +607,9 @@ class GUIHeader(QWidget):
         color = "green" if on_off == "ON" else self.pf_bgcolor()
         for key, pf in self.pframe_matrix["POST-BMA1"][13].items():
             pf.setStyleSheet("background-color:{0};".format(color))
-
+        self.toBMA1(on_off)
+        self.afterBMA1(on_off)
+            
     def toG2(self, on_off: str = "ON"):
 
         color = "green" if on_off == "ON" else self.pf_bgcolor()