diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index b050b41..14f173e 100644
Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ
diff --git a/MachMgrDBTools.cpp b/MachMgrDBTools.cpp
index 3aa5db3..ceb7a8a 100644
--- a/MachMgrDBTools.cpp
+++ b/MachMgrDBTools.cpp
@@ -625,6 +625,10 @@ MachMgr::UpdateStandardToolDraw( const ToolData* pTdata, int nGenCtx, int nToolC
    pTdata->GetParam( TPA_SIDEANG, dSideAng) ;
    double dThick = 0 ;
    pTdata->GetParam( TPA_THICK, dThick) ;
+   double dCore = 0 ;
+   pTdata->GetParam( TPA_CORE, dCore) ;
+   if ( dCore < EPS_SMALL  &&  ( nType == TT_SAW_STD  ||  nType == TT_SAW_FLAT))
+      dCore = ( dLen >= dThick ? dThick - 1 : 2 * dLen - dThick) ;
    double dSpeed = 0 ;
    pTdata->GetParam( TPA_SPEED, dSpeed) ;
   // Recupero la path dell'eventuale portautensile
@@ -657,7 +661,7 @@ MachMgr::UpdateStandardToolDraw( const ToolData* pTdata, int nGenCtx, int nToolC
       bOk = bOk && ExeLuaSetGlobStringVar( "TOOL.TOOLHOLDER", sThPath) ;
       bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.LEN", dLen) ;
       bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.DIAM", dDiam) ;
-      bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.CORE", ( dLen >= dThick ? dThick - 1 : 2 * dLen - dThick)) ;
+      bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.CORE", dCore) ;
       bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.THICK", dThick) ;
       bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.MAXMAT", dMaxMat) ;
       bOk = bOk && ExeLuaSetGlobNumVar( "TOOL.CORNRAD", dCornRad) ;
@@ -724,9 +728,6 @@ MachMgr::UpdateCustomToolDraw( const ToolData* pTdata, int nGenCtx, int nToolCtx
    pTdata->GetParam( TPA_DIAM, dDiam) ;
    double dDist = 0 ;
    pTdata->GetParam( TPA_DIST, dDist) ;
-  // Non pił limitato alle sole frese
-   //if ( nType != TT_MILL_STD  &&  nType != TT_MILL_NOTIP  &&  nType != TT_MILL_POLISHING)
-   //   return TD_INT_ERR ;
   // Imposto contesto per il disegno utensile
    if ( ! ExeSetCurrentContext( nToolCtx))
       return TD_INT_ERR ;
diff --git a/ToolData.cpp b/ToolData.cpp
index 2578a63..f69acfa 100644
--- a/ToolData.cpp
+++ b/ToolData.cpp
@@ -365,6 +365,12 @@ ToolData::SetParam( int nType, double dVal)
       else
          RemoveValInNotes( TSI_STEM_DIAM, m_sSysNotes) ;
       return true ;
+   case TPA_CORE :
+      if ( abs( dVal) > 0)
+         SetValInNotes( TSI_CORE, dVal, m_sSysNotes) ;
+      else
+         RemoveValInNotes( TSI_CORE, m_sSysNotes) ;
+      return true ;
    }
    return false ;
 }
@@ -500,6 +506,10 @@ ToolData::GetParam( int nType, double& dVal) const
       dVal = 0 ;
       GetValInNotes( m_sSysNotes, TSI_STEM_DIAM, dVal) ;
       return true ;
+   case TPA_CORE :
+      dVal = 0 ;
+      GetValInNotes( m_sSysNotes, TSI_CORE, dVal) ;
+      return true ;
    }
    dVal = 0 ;
    return false ;