diff --git a/EInAPI.h b/EInAPI.h
index cedd973..d6066e7 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -907,6 +907,7 @@ EIN_EXPORT BOOL __stdcall EgtGetAllHeadsNames( wchar_t*& wsNames) ;
 EIN_EXPORT BOOL __stdcall EgtGetAllTablesNames( wchar_t*& wsNames) ;
 // Machine Calc
 EIN_EXPORT BOOL __stdcall EgtSetCalcTool( const wchar_t* wsTool, const wchar_t* wsHead, int nExit) ;
+EIN_EXPORT BOOL __stdcall EgtGetCalcTool( wchar_t*& wsTool, wchar_t*& wsHead, int* pnExit) ;
 EIN_EXPORT BOOL __stdcall EgtGetCalcAngles( const double vtDirT[3], const double vtDirA[3],
                                             int* pnStat, double* pdAngA1, double* pdAngB1, double* pdAngA2, double* pdAngB2) ;
 EIN_EXPORT BOOL __stdcall EgtGetCalcPositions( const double ptP[3], double dAngA, double dAngB,
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 9c56678..1c5f9a1 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -1078,10 +1078,8 @@ EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ;
 EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ;
 EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ;
 EXE_EXPORT bool ExeSetRotAxisBlock( const std::string& sAxis, double dVal) ;
+EXE_EXPORT bool ExeGetCalcTool( std::string& sTool, std::string& sHead, int& nExit) ;
 EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) ;
-EXE_EXPORT bool ExeGetCalcTool( std::string& sTool) ;
-EXE_EXPORT bool ExeGetCalcHead( std::string& sHead) ;
-EXE_EXPORT bool ExeGetCalcExit( int& nExit) ;
 EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,
                                   int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ;
 EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,
diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h
index fada6f3..f6e5085 100644
--- a/EgtKeyCodes.h
+++ b/EgtKeyCodes.h
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2021
+//  EgalTech 2015-2022
 //----------------------------------------------------------------------------
-// File : EgtKeyCodes.h       Data : 01.11.21        Versione : 2.3k1
+// File : EgtKeyCodes.h       Data : 01.01.22        Versione : 2.4a1
 // Contenuto : Costanti per codici di protezione librerie di base.
 //
 //
@@ -15,6 +15,7 @@
 //             22.02.20 DS Aggiunta costante KEYOPT_EMK_NC_OFF.
 //             04.08.20 DS Portato a 22 KEY_BASELIB_VER.
 //             01.01.21 DS Nuova gestione KEY_BASELIB_VER con versione prodotto e mese.
+//             01.01.22 DS Passaggio a versione 24.
 //
 //----------------------------------------------------------------------------
 
@@ -22,7 +23,7 @@
 
 //----------------------------------------------------------------------------
 const int KEY_BASELIB_PROD = 207 ;
-const int KEY_BASELIB_VER = 2312 ;
+const int KEY_BASELIB_VER = 2401 ;
 const int KEY_BASELIB_LEV = 1 ;
 
 //----------------------------------------------------------------------------