Index: /trunk/FACT++/scripts/Main.js
===================================================================
--- /trunk/FACT++/scripts/Main.js	(revision 18371)
+++ /trunk/FACT++/scripts/Main.js	(revision 18372)
@@ -937,5 +937,5 @@
     // otherwise it is difficult to allow e.g. the STARTUP at the beginning of the night
     var power_states = sun.isUp || !system_on ? [ "DriveOff", "SystemOn" ] : [ "SystemOn" ];
-    var drive_states = sun.isUp || !system_on ? undefined : [ "Armed", "Tracking", "OnTrack" ];
+    var drive_states = sun.isUp || !system_on ? undefined : [ "Initialized", "Tracking", "OnTrack" ];
 
     // A scheduled task was found, lets check if all servers are
@@ -1136,5 +1136,5 @@
         // the new OnTrack state later and not the old one
         dim.send("DRIVE_CONTROL/STOP");
-        dim.wait("DRIVE_CONTROL", "Armed", 15000);
+        dim.wait("DRIVE_CONTROL", "Initialized", 15000);
 
         // The lid must be open
@@ -1213,5 +1213,5 @@
         // the new OnTrack state later and not the old one
         dim.send("DRIVE_CONTROL/STOP");
-        dim.wait("DRIVE_CONTROL", "Armed", 15000);
+        dim.wait("DRIVE_CONTROL", "Initialized", 15000);
 
         if (obs[sub].rstype=="dark-bias-off")
@@ -1237,5 +1237,5 @@
             dim.send("DRIVE_CONTROL/MOVE_TO", obs[sub].zd, obs[sub].az);
             v8.sleep(3000);
-            dim.wait("DRIVE_CONTROL", "Armed", 150000); // 110s for turning and 30s for stabilizing
+            dim.wait("DRIVE_CONTROL", "Initialized", 150000); // 110s for turning and 30s for stabilizing
         }
         else
@@ -1330,5 +1330,5 @@
         // the new OnTrack state later and not the old one
         dim.send("DRIVE_CONTROL/STOP");
-        dim.wait("DRIVE_CONTROL", "Armed", 15000);
+        dim.wait("DRIVE_CONTROL", "Initialized", 15000);
 
         // Ramp bias if needed
@@ -1349,5 +1349,5 @@
         dim.send("DRIVE_CONTROL/MOVE_TO", obs[sub].zd, obs[sub].az);
         v8.sleep(3000);
-        dim.wait("DRIVE_CONTROL", "Armed", 150000); // 110s for turning and 30s for stabilizing
+        dim.wait("DRIVE_CONTROL", "Initialized", 150000); // 110s for turning and 30s for stabilizing
 
         // Now tracking stable, switch voltage to nominal level and wait
@@ -1438,6 +1438,7 @@
             // the new OnTrack state later and not the old one
             dim.send("DRIVE_CONTROL/STOP");
-            dim.wait("DRIVE_CONTROL", "Armed", 15000);
-
+            dim.wait("DRIVE_CONTROL", "Initialized", 15000);
+
+            //dim.send("DRIVE_CONTROL/MOON");
             dim.send("DRIVE_CONTROL/TRACK_WOBBLE", wobble, obs[sub].source);