diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index d5da017..d31a94a 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,4 +1,4 @@
-#Fri Mar 24 09:53:40 CET 2017
+#Fri Mar 24 10:24:50 CET 2017
 colormap=Flame
 colormapAutomatic=false
 colormapMax=4000.0
@@ -21,9 +21,9 @@ rotation=0.0
 rotationCrop=false
 scale=1.0
 serverURL=localhost\:10000
-spatialCalOffsetX=-861.4939970777481
-spatialCalOffsetY=-820.4883730911062
-spatialCalScaleX=-18.90359092620482
-spatialCalScaleY=-19.37984500632817
+spatialCalOffsetX=-630.5060320164276
+spatialCalOffsetY=-612.5104241897614
+spatialCalScaleX=-26.761820720381525
+spatialCalScaleY=-26.595744663521685
 spatialCalUnits=mm
 transpose=false
diff --git a/devices/camtool.properties b/devices/camtool.properties
index b9db5da..c88a7ff 100644
--- a/devices/camtool.properties
+++ b/devices/camtool.properties
@@ -1,4 +1,4 @@
-#Tue Mar 21 12:06:25 CET 2017
+#Fri Mar 24 09:56:37 CET 2017
 colormap=Temperature
 colormapAutomatic=true
 colormapMax=578.797
@@ -18,9 +18,9 @@ roiY=0
 rotation=0.0
 rotationCrop=false
 scale=1.0
-spatialCalOffsetX=8751.115234375
-spatialCalOffsetY=16276.595703125
-spatialCalScaleX=-26.761820720381525
-spatialCalScaleY=-26.595744663521685
+spatialCalOffsetX=16275.9921875
+spatialCalOffsetY=15891.47265625
+spatialCalScaleX=-18.90359092620482
+spatialCalScaleY=-19.37984500632817
 spatialCalUnits=mm
 transpose=false
diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py
index d31d38d..b662067 100755
--- a/script/Alignment/Laser_gun_alignment.py
+++ b/script/Alignment/Laser_gun_alignment.py
@@ -28,9 +28,12 @@ else:
     centroid_excursion_plot = False
 
 #from camtool import CamTool
-run("camtool")
+#run("camtool")
 #from ImageStats import ImageStats, get_simulated_source
 #from BpmStats import BpmStats
+
+check_camtool()
+camtool.start("SINEG01-DSCR190")
     
 
 laser_was_on = is_laser_on()
@@ -45,12 +48,15 @@ if (use_bpm):
     use_background = False
     multiple_background = False
 else:
+    camtool.start("SINEG01-DSCR190")
+    """    
     latch = True    
     if get_device("image_stats") is None:
         print "Instantiating camtool"    
         add_device(CamTool("image_stats",  prefix = "SINEG01-DSCR190:", latch = True, camera = "SINEG01-DSCR190"), True)
     if (image_stats.latch):
         image_stats.start()
+    """
 #add_device(ImageStats("image_stats", get_simulated_source(image)), True)
 
 image_stats.setNumberOfImages(max(number_images,1))
diff --git a/script/test/TestCamtoolClient.py b/script/test/TestCamtoolClient.py
index 2a44bfe..384ee9f 100644
--- a/script/test/TestCamtoolClient.py
+++ b/script/test/TestCamtoolClient.py
@@ -10,7 +10,6 @@ x  = CamtoolValue("gr_x_fit_mean")
 
 
 av = create_averager(x, 5, 0.05, "Average")
-#
 av.setMonitored(True)
 tscan(av, 10, 1.0)