diff --git a/SurfFinishing.cpp b/SurfFinishing.cpp
index 4c15ab6..e8870df 100644
--- a/SurfFinishing.cpp
+++ b/SurfFinishing.cpp
@@ -1,4 +1,5 @@
 //----------------------------------------------------------------------------
+//----------------------------------------------------------------------------
 //  EgalTech 2019-2019
 //----------------------------------------------------------------------------
 // File : SurfFinishing.cpp       Data : 28.05.19          Versione : 2.1e5
@@ -3320,17 +3321,14 @@ SurfFinishing::AddZConst( ICAvToolSurfTm* pCAvTlStm, const SURFLOCALVECTOR& vSrf
              Point3d ptP3 = pLine->GetEnd() ;
              Vector3d vtMove ; pLine->GetStartDir( vtMove) ;
              SetFeed( GetRightFeed( vtMove, vtTool)) ;
-             if ( AddLinearMove( ptP3) == GDB_ID_NULL)
+             if ( AddLinearMove( ptP3, bSplitArcs) == GDB_ID_NULL)
                 return false ;
           }
           else if ( pCurve->GetType() == CRV_ARC) {
              ICurveArc* pArc = GetCurveArc( pCurve) ;
-             Point3d ptCen = pArc->GetCenter() ;
-             double dAngCen = pArc->GetAngCenter() ;
-             Vector3d vtN = pArc->GetNormVersor() ;
-             Point3d ptP3 ; pArc->GetEndPoint( ptP3) ;
-             SetFeed( GetFeed()) ;
-             if ( AddArcMove( ptP3, ptCen, dAngCen, vtN) == GDB_ID_NULL)
+             Vector3d vtMove ; pArc->GetStartDir( vtMove) ;
+             SetFeed( GetRightFeed( vtMove, vtTool)) ;
+             if ( AddCurveMove( pArc, bSplitArcs) == GDB_ID_NULL)
                 return false ;
           }
         // se ultima entità
@@ -5721,25 +5719,22 @@ SurfFinishing::AddOptimal( ICAvToolSurfTm* pCAvTlStm, const SURFLOCALVECTOR& vSr
                return false ;
             }
          }
-        // elaborazioni sulla curva corrente (sempre un segmento di retta)
-          if ( pCurve->GetType() == CRV_LINE) {
-             ICurveLine* pLine = GetCurveLine( pCurve) ;
-             Point3d ptP3 = pLine->GetEnd() ;
-             Vector3d vtMove ; pLine->GetStartDir( vtMove) ;
-             SetFeed( GetRightFeed( vtMove, vtTool)) ;
-             if ( AddLinearMove( ptP3) == GDB_ID_NULL)
-                return false ;
-          }
-          else if ( pCurve->GetType() == CRV_ARC) {
-             ICurveArc* pArc = GetCurveArc( pCurve) ;
-             Point3d ptCen = pArc->GetCenter() ;
-             double dAngCen = pArc->GetAngCenter() ;
-             Vector3d vtN = pArc->GetNormVersor() ;
-             Point3d ptP3 ; pArc->GetEndPoint( ptP3) ;
-             SetFeed( GetFeed()) ;
-             if ( AddArcMove( ptP3, ptCen, dAngCen, vtN) == GDB_ID_NULL)
-                return false ;
-          }
+        // elaborazioni sulla curva corrente (segmento di retta o arco)
+         if ( pCurve->GetType() == CRV_LINE) {
+            ICurveLine* pLine = GetCurveLine( pCurve) ;
+            Point3d ptP3 = pLine->GetEnd() ;
+            Vector3d vtMove ; pLine->GetStartDir( vtMove) ;
+            SetFeed( GetRightFeed( vtMove, vtTool)) ;
+            if ( AddLinearMove( ptP3, bSplitArcs) == GDB_ID_NULL)
+               return false ;
+         }
+         else if ( pCurve->GetType() == CRV_ARC) {
+            ICurveArc* pArc = GetCurveArc( pCurve) ;
+            Vector3d vtMove ; pArc->GetStartDir( vtMove) ;
+            SetFeed( GetRightFeed( vtMove, vtTool)) ;
+            if ( AddCurveMove( pArc, bSplitArcs) == GDB_ID_NULL)
+               return false ;
+         }
         // se ultima entità
          if ( i == nMaxInd) {
            // dati fine entità