diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc
index 89cc9ee..ba388c4 100644
Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ
diff --git a/ToolsMgr.cpp b/ToolsMgr.cpp
index ae7e129..7cd8c6c 100644
--- a/ToolsMgr.cpp
+++ b/ToolsMgr.cpp
@@ -683,9 +683,11 @@ ToolsMgr::GetCurrToolMaxDepth( double dSafe, double& dMaxDepth) const
       double dTHoldBase = 0 ;
       double dTHoldLen = 0 ;
       double dTHoldDiam = 0 ;
-      if ( ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam)) {
+      bool bBaseOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
+      bool bLenOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen) ;
+      bool bDiamOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam) ;
+      if ( ! bBaseOk  ||  ! bLenOk  ||  ! bDiamOk) {
+         (const_cast<ToolsMgr*>(this))->UpdateCurrToolHolderData( dTHoldBase, dTHoldLen, dTHoldDiam) ;
          (const_cast<ToolsMgr*>(this))->SaveCurrTool() ;
          Save() ;  
          GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
@@ -741,9 +743,11 @@ ToolsMgr::GetCurrToolThDiam( double& dThDiam) const
       double dTHoldBase = 0 ;
       double dTHoldLen = 0 ;
       double dTHoldDiam = 0 ;
-      if ( ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam)) {
+      bool bBaseOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
+      bool bLenOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen) ;
+      bool bDiamOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam) ;
+      if ( ! bBaseOk  ||  ! bLenOk  ||  ! bDiamOk) {
+         (const_cast<ToolsMgr*>(this))->UpdateCurrToolHolderData( dTHoldBase, dTHoldLen, dTHoldDiam) ;
          (const_cast<ToolsMgr*>(this))->SaveCurrTool() ;
          Save() ;  
          GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
@@ -780,9 +784,11 @@ ToolsMgr::GetCurrToolThLength( double& dThLen) const
       double dTHoldBase = 0 ;
       double dTHoldLen = 0 ;
       double dTHoldDiam = 0 ;
-      if ( ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen)  ||
-           ! GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam)) {
+      bool bBaseOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;
+      bool bLenOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THLEN, dTHoldLen) ;
+      bool bDiamOk = GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THDIAM, dTHoldDiam) ;
+      if ( ! bBaseOk  ||  ! bLenOk  ||  ! bDiamOk) {
+         (const_cast<ToolsMgr*>(this))->UpdateCurrToolHolderData( dTHoldBase, dTHoldLen, dTHoldDiam) ;
          (const_cast<ToolsMgr*>(this))->SaveCurrTool() ;
          Save() ;  
          GetValInNotes( m_tdCurrTool.m_sSysNotes, TSI_THBASE, dTHoldBase) ;