diff --git a/Common_FAST.NUM.mlpe b/Common_FAST.NUM.mlpe
index 6f857d9..360a8c3 100644
--- a/Common_FAST.NUM.mlpe
+++ b/Common_FAST.NUM.mlpe
@@ -848,13 +848,13 @@ function OnRapid()
          local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
                       ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
          EmtOutput( sOut)
-         EmtOutput( 'M101 P1=2')
-         EmtOutput( 'M101 P1=3')
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
          sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
                 ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
          EmtOutput( sOut)
-         EmtOutput( 'M101 P1=2')
-         EmtOutput( 'M101 P1=3')
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
       end
    -- se altrimenti movimento in Home
    elseif EMT.FLAG == 4 then
@@ -876,7 +876,7 @@ function OnRapid()
                              EmtGetAxis( 'R2') .. EmtGetAxis( 'R1') .. sEE .. sEL .. sER .. sET .. sES
       EmtOutput( sOut)
       EmtOutput( 'G101 ET1001')
-      EmtOutput( 'G101 ET2001')            
+      EmtOutput( 'G101 ET2001')
    -- altrimenti errore
    else
       EmtSetLastError( 1212, "Unknown Rapid flag")
diff --git a/Common_FAST.NUM_PLUS.mlpe b/Common_FAST.NUM_PLUS.mlpe
index d035f7a..2dac2f3 100644
--- a/Common_FAST.NUM_PLUS.mlpe
+++ b/Common_FAST.NUM_PLUS.mlpe
@@ -922,14 +922,14 @@ function OnRapid()
          local sOut = 'G101' .. EmtGetAxis( 'L2') .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
                       ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
          EmtOutput( sOut)
-         EmtOutput( 'M101 P1=2')
-         EmtOutput( 'M101 P1=3')
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
          sOut = 'G101' .. ' X' .. EmtLenToString( -SafeXRotAxes, 3) .. EmtGetAxis( 'L3') ..' B=' .. EgtNumToString( dBAxis, 3) ..
                 ' C=' .. EgtNumToString( dCAxis, 3) .. sEE .. sEL .. sER .. sET .. sES
          EmtOutput( sOut)
-         EmtOutput( 'M101 P1=2')
-         EmtOutput( 'M101 P1=3')
-      end
+         EmtOutput( 'G101 ET1001')
+         EmtOutput( 'G101 ET2001')
+         end
    -- se altrimenti movimento in Home
    elseif EMT.FLAG == 4 then
       -- non previsto
diff --git a/UpdateLog.txt b/UpdateLog.txt
index a3d24db..0299dc9 100644
--- a/UpdateLog.txt
+++ b/UpdateLog.txt
@@ -1,7 +1,10 @@
            ==== Common_FAST Update Log ====
 
+Versione 2.6j3 (11/10/2024)
+- (GEN) Corretta scrittura macro start/attesa movimenti per NUM. Veniva scritto codice per TPA.
+
 Versione 2.6j2 (03/10/2024)
-- (SIM-GEN) Piccola correwzione calcolo posizione carrello durante riposizionamento, nuova gestione
+- (SIM-GEN) Piccola correzione calcolo posizione carrello durante riposizionamento, nuova gestione
 
 Versione 2.6j1 (01/10/2024)
 - (SIM-GEN) Sistemato calcolo in nuova disposzione carrelli
diff --git a/Version.lua b/Version.lua
index efc8036..d4cad28 100644
--- a/Version.lua
+++ b/Version.lua
@@ -3,7 +3,7 @@
 
 local InfoCommon_STD_PP = {
    NAME = 'Common_FAST',            -- nome script PP standard
-   VERSION = '2.6j2',                 -- versione script
+   VERSION = '2.6j3',                 -- versione script
    MIN_MACH_VER_PP_COMMON = '2.5k1'   -- versione minima kernel
 }