diff --git a/Common_ONE-PF.NUM.mlpe b/Common_ONE-PF.NUM.mlpe
index 537aa53..ff1834d 100644
--- a/Common_ONE-PF.NUM.mlpe
+++ b/Common_ONE-PF.NUM.mlpe
@@ -1146,10 +1146,12 @@ function OnRapid()
                   local HomeX1 = EgtGetAxisHomePos( 'X1')
                   EmitMoveDataHead( 1, { X=-HomeX1, Z=MaxZ1, B=ParkB1, C=ParkC1})
                   EmitMoveStartHead( 1, 'EA1')
+                  EmitMoveWaitHead( 1)
                else
                   local HomeX2 = EgtGetAxisHomePos( 'X2')
                   EmitMoveDataHead( 2, { X=-HomeX2, Z=MaxZ2, B=ParkB2, C=ParkC2})
                   EmitMoveStartHead( 2, 'EA1')
+                  EmitMoveWaitHead( 2)
                end
             else
                if not HeadIsChainSaw( EMT.PREVHEAD) then
@@ -1157,18 +1159,22 @@ function OnRapid()
                      local HomeX1 = EgtGetAxisHomePos( 'X1')
                      EmitMoveDataHead( 1, { X=-EMT.PREVHOMEX_H1, Z=MaxZ1, B=ParkB1, C=ParkC1, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H1)})
                      EmitMoveStartHead( 1, 'EA1')
+                     EmitMoveWaitHead( 1)
                   else
                      local HomeX2 = EgtGetAxisHomePos( 'X2')
                      EmitMoveDataHead( 2, { X=-EMT.PREVHOMEX_H2, Z=MaxZ2, B=ParkB2, C=ParkC2, TPos=AdjustTcPos( false, EMT.PREVTCPOS_H2)})
                      EmitMoveStartHead( 2, 'EA1')
+                     EmitMoveWaitHead( 2)
                   end
                else
                   if GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC1' or GetHeadTCSet( EMT.PREVHEAD, EMT.PREVTCPOS) == 'Head1_TC2' then
                      EmitMoveDataHead( 1, { X=-ParkCSawX1S, Z=MaxZ1, B=HomeR2, C=HomeR1, TPos='50'})
                      EmitMoveStartHead( 1, 'EA1')
+                     EmitMoveWaitHead( 1)
                   else
                      EmitMoveDataHead( 2, { X=-ParkCSawX2S, Z=MaxZ2, B=HomeR2, C=HomeR1, TPos='50'})
                      EmitMoveStartHead( 2, 'EA1')
+                     EmitMoveWaitHead( 2)
                   end
                end
             end
diff --git a/Essetre-ONE.mlde b/Essetre-ONE.mlde
index cac97ba..c4ae8fd 100644
--- a/Essetre-ONE.mlde
+++ b/Essetre-ONE.mlde
@@ -76,7 +76,7 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.6i4'
+PP_VER = '2.6i4_DEV'
 PP_NVER = '2.6.9.4'
 MIN_MACH_VER = '2.5k1'
 MACH_NAME = 'Essetre-ONE'