diff --git a/MachMgrDBTools.cpp b/MachMgrDBTools.cpp
index 0249df0..78ec7f6 100644
--- a/MachMgrDBTools.cpp
+++ b/MachMgrDBTools.cpp
@@ -760,6 +760,8 @@ MachMgr::UpdateCustomToolDraw( const ToolData* pTdata, int nGenCtx, int nToolCtx
    pTdata->GetParam( TPA_DIAM, dDiam) ;
    double dDist = 0 ;
    pTdata->GetParam( TPA_DIST, dDist) ;
+   double dSpeed = 0 ;
+   pTdata->GetParam( TPA_SPEED, dSpeed) ;
   // Imposto contesto per il disegno utensile
    if ( ! ExeSetCurrentContext( nToolCtx))
       return TD_INT_ERR ;
@@ -769,6 +771,7 @@ MachMgr::UpdateCustomToolDraw( const ToolData* pTdata, int nGenCtx, int nToolCtx
    bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.LEN", dLen) ;
    bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.DIAM", dDiam) ;
    bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.DIST", dDist) ;
+   bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.SPEED", dSpeed) ;
   // Eseguo aggiornamento utensile
    bOk = bOk && ExeLuaCallFunction( "AdjustCustomTool") ;
   // Recupero errore
diff --git a/Milling.cpp b/Milling.cpp
index 9bcf67f..46eefa7 100644
--- a/Milling.cpp
+++ b/Milling.cpp
@@ -2247,6 +2247,7 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
    double dSafeAggrBottZ = m_pMchMgr->GetCurrMachiningsMgr()->GetSafeAggrBottZ() ;
   // lunghezza di approccio/retrazione
    double dAppr = m_Params.m_dStartPos ;
+   double dExtrAppr = dAppr + max( 0.0, m_TParams.m_dTLen - m_TParams.m_dLen) ;
 
   // in caso di tabs ne aggiusto i parametri secondo il percorso
    TabData tdTabs ;
@@ -2333,7 +2334,7 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
                dStElev = -LIO_ELEV_TOL ;
             }
            // approccio al punto iniziale
-            if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dAppr, bOutStart, bAboveStart)) {
+            if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dExtrAppr, bOutStart, bAboveStart)) {
                m_pMchMgr->SetLastError( 2309, "Error in Milling : Approach not computable") ;
                return false ;
             }
@@ -2500,7 +2501,7 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
             bool bUhAboveEnd = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                      m_TParams.m_dLen, false, dSafeZ, vtEscape, dEndElev) ;
            // aggiungo retrazione
-            if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr, bAboveEnd)) {
+            if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dExtrAppr, bAboveEnd)) {
                m_pMchMgr->SetLastError( 2312, "Error in Milling : Retract not computable") ;
                return false ;
             }
@@ -2574,6 +2575,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
    double dSafeAggrBottZ = m_pMchMgr->GetCurrMachiningsMgr()->GetSafeAggrBottZ() ;
   // lunghezza di approccio/retrazione
    double dAppr = m_Params.m_dStartPos ;
+   double dExtrAppr = dAppr + max( 0.0, m_TParams.m_dTLen - m_TParams.m_dLen) ;
 
   // determino numero e affondamento degli step
    int nStep = max( 1, static_cast<int>( ceil( dElev / dOkStep))) ;
@@ -2684,7 +2686,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                      dStElev = - LIO_ELEV_TOL ;
                   }
                  // approccio al punto iniziale
-                  if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dAppr, bOutStart, bAboveStart)) {
+                  if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dExtrAppr, bOutStart, bAboveStart)) {
                      m_pMchMgr->SetLastError( 2309, "Error in Milling : Approach not computable") ;
                      return false ;
                   }
@@ -2940,7 +2942,7 @@ Milling::AddZigZagMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                bool bUhAboveEnd = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                         m_TParams.m_dLen, false, dSafeZ, vtEscape, dEndElev) ;
               // aggiungo retrazione
-               if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr, bAboveEnd)) {
+               if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dExtrAppr, bAboveEnd)) {
                   m_pMchMgr->SetLastError( 2312, "Error in Milling : Retract not computable") ;
                   return false ;
                }
@@ -2961,6 +2963,7 @@ Milling::AddOneWayMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
    double dSafeAggrBottZ = m_pMchMgr->GetCurrMachiningsMgr()->GetSafeAggrBottZ() ;
   // lunghezza di approccio/retrazione
    double dAppr = m_Params.m_dStartPos ;
+   double dExtrAppr = dAppr + max( 0.0, m_TParams.m_dTLen - m_TParams.m_dLen) ;
 
   // in caso di tabs ne aggiusto i parametri secondo il percorso
    TabData tdTabs ;
@@ -3156,7 +3159,7 @@ Milling::AddOneWayMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                   }
                  // approccio standard al punto iniziale
                   if ( j == 1  ||  bMidRetract) {
-                     if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dAppr, bOutStart, bAboveStartEnd)) {
+                     if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dExtrAppr, bOutStart, bAboveStartEnd)) {
                         m_pMchMgr->SetLastError( 2309, "Error in Milling : Approach not computable") ;
                         return false ;
                      }
@@ -3334,7 +3337,7 @@ Milling::AddOneWayMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                   bool bUhAboveEnd = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                            m_TParams.m_dLen, false, dSafeZ, vtEscape, dEndElev) ;
                  // aggiungo retrazione
-                  if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr, bAboveStartEnd)) {
+                  if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dExtrAppr, bAboveStartEnd)) {
                      m_pMchMgr->SetLastError( 2312, "Error in Milling : Retract not computable") ;
                      return false ;
                   }
@@ -3408,7 +3411,9 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
    double dSafeAggrBottZ = m_pMchMgr->GetCurrMachiningsMgr()->GetSafeAggrBottZ() ;
   // lunghezza di approccio/retrazione
    double dAppr = m_Params.m_dStartPos ;
-  // se attacco ad inseguimento (per ora nullo), parto sopra di elevazione in attacco
+   double dExtrAppr = dAppr + max( 0.0, m_TParams.m_dTLen - m_TParams.m_dLen) ;
+
+   // se attacco ad inseguimento (per ora nullo), parto sopra di elevazione in attacco
    double dStart = 0 ;
    if ( m_Params.m_nLeadInType == MILL_LI_NONE)
       dStart = m_Params.m_dLiElev ;
@@ -3491,7 +3496,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                   bool bUhAboveStart = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                              m_TParams.m_dLen, false, dSafeZ, vtEscape, dStElev) ;
                  // approccio al punto iniziale
-                  if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dAppr, bOutStart, bAboveStart)) {
+                  if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dExtrAppr, bOutStart, bAboveStart)) {
                      m_pMchMgr->SetLastError( 2309, "Error in Milling : Approach not computable") ;
                      return false ;
                   }
@@ -3599,7 +3604,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                   bool bUhAboveEnd = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                            m_TParams.m_dLen, false, dSafeZ, vtEscape, dEndElev) ;
                  // aggiungo retrazione
-                  if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr, bAboveEnd)) {
+                  if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dExtrAppr, bAboveEnd)) {
                      m_pMchMgr->SetLastError( 2312, "Error in Milling : Retract not computable") ;
                      return false ;
                   }
@@ -3679,7 +3684,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                   bool bUhAboveStart = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                              m_TParams.m_dLen, false, dSafeZ, vtEscape, dStElev) ;
                  // approccio al punto iniziale
-                  if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dAppr, bOutStart, bAboveStart)) {
+                  if ( ! AddApproach( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dStElev, dExtrAppr, bOutStart, bAboveStart)) {
                      m_pMchMgr->SetLastError( 2309, "Error in Milling : Approach not computable") ;
                      return false ;
                   }
@@ -3782,7 +3787,7 @@ Milling::AddSpiralMilling( const ICurveComposite* pCompo, const Vector3d& vtTool
                   bool bUhAboveEnd = ! m_bAboveHead && GetUhPointAboveRaw( ptP1, vtTool, 0, GetRadiusForStartEndElevation(),
                                                                            m_TParams.m_dLen, false, dSafeZ, vtEscape, dEndElev) ;
                  // aggiungo retrazione
-                  if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dAppr, bAboveEnd)) {
+                  if ( ! AddRetract( ptP1, vtTool, dSafeZ, dSafeAggrBottZ, dEndElev, dExtrAppr, bAboveEnd)) {
                      m_pMchMgr->SetLastError( 2312, "Error in Milling : Retract not computable") ;
                      return false ;
                   }