diff --git a/EGkCAvToolSurfTm.h b/EGkCAvToolSurfTm.h
index 8a09951..cbbe486 100644
--- a/EGkCAvToolSurfTm.h
+++ b/EGkCAvToolSurfTm.h
@@ -30,8 +30,8 @@ class __declspec( novtable) ICAvToolSurfTm {
       virtual bool SetSurfTm( const ISurfTriMesh& Stm) = 0 ;
       virtual bool SetMoveDir( const Vector3d& vtMove) = 0 ;
       virtual bool SetStdTool( double dH, double dR, double dCornR) = 0 ;
-      virtual double TestPosition( const Point3d& ptT, const Vector3d& vtDir) = 0 ;
-      // TestPath
+      virtual bool TestPosition( const Point3d& ptT, const Vector3d& vtDir, double& dTotDist) = 0 ;
+      virtual bool TestPath( PNTULIST& lPntM, const Vector3d& vtDir, double dLinTol) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------
diff --git a/EGkPolyLine.h b/EGkPolyLine.h
index 3b7484f..c4c73de 100644
--- a/EGkPolyLine.h
+++ b/EGkPolyLine.h
@@ -97,6 +97,8 @@ class PolyLine
                         { return GetLastULine( nullptr, &ptIni, nullptr, &ptFin) ; }
       EGK_EXPORT bool GetPrevLine( Point3d& ptIni, Point3d& ptFin) const
                         { return GetPrevULine( nullptr, &ptIni, nullptr, &ptFin) ; }
+      EGK_EXPORT PNTULIST& GetUPointList( void)
+                              { return m_lUPoints ; }
       EGK_EXPORT bool IsFlat( int& nRank, Point3d& ptCen, Vector3d& vtDir, double dToler = EPS_SMALL) const ;
       EGK_EXPORT bool IsClosedAndFlat( Plane3d& plPlane, double& dArea, double dToler = EPS_SMALL) const ;
       EGK_EXPORT bool GetApproxLength( double& dLen) const ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index f89bca2..a02d2e3 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -613,8 +613,9 @@ EXE_EXPORT bool ExeVerifyMachining( int nMchId, int& nResult) ;
 EXE_EXPORT int  ExeVerifyCutAsSplitting( int nMchId) ;
 
 // Collision Avoidance Tool SurfaceTriMesh
-EXE_EXPORT double ExeCAvToolStmPosition( double dToolLen, double dToolDiam, double dToolCornR, int nSurfTmId,
-                                         const Point3d& ptP, const Vector3d& vtAx, const Vector3d& vtMove, int nRefType) ;
+EXE_EXPORT bool ExeCAvSetStdTool( double dToolLen, double dToolDiam, double dToolCornR) ;
+EXE_EXPORT double ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, int nRefType) ;
+EXE_EXPORT bool ExeCAvToolPathStm( int nCrvId, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, double dLinTol, int nRefType) ;
 
 // Machining
 EXE_EXPORT bool ExeInitMachMgr( const std::string& sMachinesDir) ;