diff --git a/Strategies/Standard/HEADCUT/HEADCUT.lua b/Strategies/Standard/HEADCUT/HEADCUT.lua
index 6ad6bd2..09bcb2e 100644
--- a/Strategies/Standard/HEADCUT/HEADCUT.lua
+++ b/Strategies/Standard/HEADCUT/HEADCUT.lua
@@ -278,7 +278,7 @@ function HEADCUT.Make( bAddMachining, Proc, Part, CustomParameters)
          local EdgeToMachine = GetEdgeToMachine( Proc, -Y_AX())
          -- approccio e retrazione
          OptionalParameters.LeadIn, OptionalParameters.LeadOut = CalculateLeadInOut( Splitting, EdgeToMachine)
-         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
          Splitting.sStage = 'Head'
          MachiningLib.AddNewMachining( Proc, Splitting, AuxiliaryData)
    ----------------------------------------------------------------------------------
@@ -295,7 +295,7 @@ function HEADCUT.Make( bAddMachining, Proc, Part, CustomParameters)
          local EdgeToMachine = GetEdgeToMachine( Proc, -Y_AX())
          -- approccio e retrazione
          OptionalParameters.LeadIn, OptionalParameters.LeadOut = CalculateLeadInOut( Splitting, EdgeToMachine)
-         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
          Splitting.sStage = 'Head'
          MachiningLib.AddNewMachining( Proc, Splitting, AuxiliaryData)
    
@@ -313,7 +313,7 @@ function HEADCUT.Make( bAddMachining, Proc, Part, CustomParameters)
          EdgeToMachine = GetEdgeToMachine( Proc, Y_AX())
          -- approccio e retrazione
          OptionalParameters.LeadIn, OptionalParameters.LeadOut = CalculateLeadInOut( Splitting, EdgeToMachine)
-         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
          Splitting.sStage = 'Head'
          MachiningLib.AddNewMachining( Proc, Splitting, AuxiliaryData)
    ----------------------------------------------------------------------------------
@@ -329,7 +329,7 @@ function HEADCUT.Make( bAddMachining, Proc, Part, CustomParameters)
          local EdgeToMachine = GetEdgeToMachine( Proc, Z_AX())
          -- approccio e retrazione
          OptionalParameters.LeadIn, OptionalParameters.LeadOut = CalculateLeadInOut( Splitting, EdgeToMachine)
-         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
          Splitting.sStage = 'Head'
          MachiningLib.AddNewMachining( Proc, Splitting, AuxiliaryData)
    ----------------------------------------------------------------------------------
@@ -347,7 +347,7 @@ function HEADCUT.Make( bAddMachining, Proc, Part, CustomParameters)
          local EdgeToMachine = GetEdgeToMachine( Proc, Z_AX())
          -- approccio e retrazione
          OptionalParameters.LeadIn, OptionalParameters.LeadOut = CalculateLeadInOut( Splitting, EdgeToMachine)
-         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
          Splitting.sStage = 'Head'
          MachiningLib.AddNewMachining( Proc, Splitting, AuxiliaryData)
    
@@ -365,7 +365,7 @@ function HEADCUT.Make( bAddMachining, Proc, Part, CustomParameters)
          EdgeToMachine = GetEdgeToMachine( Proc, -Z_AX())
          -- approccio e retrazione
          OptionalParameters.LeadIn, OptionalParameters.LeadOut = CalculateLeadInOut( Splitting, EdgeToMachine)
-         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+         Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
          Splitting.sStage = 'Head'
          MachiningLib.AddNewMachining( Proc, Splitting, AuxiliaryData)
    ----------------------------------------------------------------------------------
diff --git a/StrategyLibs/FACEBYBLADE.lua b/StrategyLibs/FACEBYBLADE.lua
index 6a67764..c06c725 100644
--- a/StrategyLibs/FACEBYBLADE.lua
+++ b/StrategyLibs/FACEBYBLADE.lua
@@ -68,14 +68,14 @@ function FACEBYBLADE.Make( Proc, Part, FaceToMachine, EdgeToMachine, OptionalPar
    local Cutting = {}
 
    local vtMachiningDirection = EdgeToMachine.Norm
-   local vtN = Proc.Faces[FaceToMachine+1].vtN
+   local vtN = Proc.Faces[FaceToMachine.id+1].vtN
    Cutting.sDepth = OptionalParameters.sDepth or 0
    Cutting.dLongitudinalOffset = OptionalParameters.dLongitudinalOffset or 0
    Cutting.dRadialOffset = OptionalParameters.dRadialOffset or 0
 
    Cutting.nType = MCH_MY.MILLING
    Cutting.nToolIndex = OptionalParameters.nToolIndex
-   Cutting.Geometry = {{ Proc.id, FaceToMachine}}
+   Cutting.Geometry = {{ Proc.id, FaceToMachine.id}}
    Cutting.id = Proc.id
    Cutting.vtToolDirection = vtMachiningDirection
 
diff --git a/StrategyLibs/SPLITCUT.lua b/StrategyLibs/SPLITCUT.lua
index ad38747..a0862c6 100644
--- a/StrategyLibs/SPLITCUT.lua
+++ b/StrategyLibs/SPLITCUT.lua
@@ -243,7 +243,7 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
       local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, -Y_AX())
       -- approccio e retrazione
       OptionalParameters.LeadIn, OptionalParameters.LeadOut = SPLITCUT.CalculateLeadInOut( EdgeToMachine)
-      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
       table.insert( Machinings, Machining)
 
   ----------------------------------------------------------------------------------
@@ -263,7 +263,7 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
       local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, -Y_AX())
       -- approccio e retrazione
       OptionalParameters.LeadIn, OptionalParameters.LeadOut = SPLITCUT.CalculateLeadInOut( EdgeToMachine)
-      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
       table.insert( Machinings, Machining)
 
       -- Taglio lato dietro
@@ -283,7 +283,7 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
       EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, Y_AX())
       -- approccio e retrazione
       OptionalParameters.LeadIn, OptionalParameters.LeadOut = SPLITCUT.CalculateLeadInOut( EdgeToMachine)
-      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
       table.insert( Machinings, Machining)
   ----------------------------------------------------------------------------------
    elseif Strategy.SplitStrategy.sTypeMachining == 'BladeHorizontalSingle' then
@@ -303,7 +303,7 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
       local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, Z_AX())
       -- approccio e retrazione
       OptionalParameters.LeadIn, OptionalParameters.LeadOut = SPLITCUT.CalculateLeadInOut( EdgeToMachine)
-      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
       table.insert( Machinings, Machining)
   ----------------------------------------------------------------------------------
    elseif Strategy.SplitStrategy.sTypeMachining == 'BladeHorizontalDouble' then
@@ -324,7 +324,7 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
       local EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, Z_AX())
       -- approccio e retrazione
       OptionalParameters.LeadIn, OptionalParameters.LeadOut = SPLITCUT.CalculateLeadInOut( EdgeToMachine)
-      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
       table.insert( Machinings, Machining)
 
       -- Taglio lato dietro
@@ -344,7 +344,7 @@ function SPLITCUT.Execute( Proc, Part, Strategy)
       EdgeToMachine = SPLITCUT.GetEdgeToMachine( Proc, -Z_AX())
       -- approccio e retrazione
       OptionalParameters.LeadIn, OptionalParameters.LeadOut = SPLITCUT.CalculateLeadInOut( EdgeToMachine)
-      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1].id, EdgeToMachine, OptionalParameters)
+      Machining.Splitting = FaceByBlade.Make( Proc, Part, Proc.Faces[1], EdgeToMachine, OptionalParameters)
       table.insert( Machinings, Machining)
   ----------------------------------------------------------------------------------
    elseif Strategy.SplitStrategy.sTypeMachining == 'ChainSawHorizontal' then