diff --git a/config/devices.properties b/config/devices.properties
index b91ca72..b23e4cb 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/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py
index 7382dcd..8bb6498 100755
--- a/script/Alignment/Laser_gun_alignment.py
+++ b/script/Alignment/Laser_gun_alignment.py
@@ -68,7 +68,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/local.py b/script/local.py
index d815116..6d8bd3c 100755
--- a/script/local.py
+++ b/script/local.py
@@ -12,13 +12,13 @@ import java.awt.Color as Color
 LASER_SETTLING_TIME = 0.1     
        
 def laser_on():
-    #caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 0)
     print "Laser On"
+    caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 0)    
     time.sleep(LASER_SETTLING_TIME)
     
 def laser_off():
-    #caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 1)
     print "Laser Off"
+    caput("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", 1)    
     time.sleep(LASER_SETTLING_TIME)