diff --git a/config/devices.properties b/config/devices.properties
index b91ca72..8c7cad8 100755
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,5 +1,5 @@
-$gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true
-$gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true
+#$gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true
+#$gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true
 #SINSB01_phase=ch.psi.pshell.epics.Positioner|VA-SINSB01-RSYS100:SET-BEAM-PHASE VA-SINSB01-RSYS100:GET-BEAM-PHASE|||true
 #BC1_energy=ch.psi.pshell.epics.ChannelDouble|VA-SINBC02-DBPM140:ENERGY|Read||true
 #SARUN02_MCRX080=ch.psi.pshell.epics.Positioner|VA-SARUN02-MCRX080:I-SET VA-SARUN02-MCRX080:I-READ|||true
diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py
index b45b04f..971b3b4 100755
--- a/script/Alignment/Gun_solenoid_alignment.py
+++ b/script/Alignment/Gun_solenoid_alignment.py
@@ -66,7 +66,7 @@ mag = [ "SINEG01-MCRX120","SINEG01-MCRY120",
         "SINEG01-MQUA310",
         "SINEG01-MQUA320" ]
 
-#switch_off_magnets(mag)   
+switch_off_magnets(mag)   
 
 # add here gun phase setting see wiki page
 
diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py
index e1d6e28..7382dcd 100755
--- a/script/Alignment/Laser_gun_alignment.py
+++ b/script/Alignment/Laser_gun_alignment.py
@@ -24,7 +24,7 @@ if get_context().source == CommandSource.ui:
     number_backgrounds = 5
     do_elog = False    
     centroid_excursion_plot = True
-else:
+else:    
     centroid_excursion_plot = False
 
 from camtool import CamTool
@@ -39,6 +39,8 @@ plot_name = datetime.datetime.fromtimestamp(time.time()).strftime('%H%M%S')
 
 if (use_bpm):
     add_device(BpmStats("image_stats", "SINEG01-DBPM340"), True)
+    use_background = False
+    multiple_background = False
 else:
     latch = True    
     if get_device("image_stats") is None: