diff --git a/Essetre-FAST.mlde b/Essetre-FAST.mlde
index feefaaf..21180c8 100644
--- a/Essetre-FAST.mlde
+++ b/Essetre-FAST.mlde
@@ -24,9 +24,9 @@
 require( 'EmtGenerator')
 EgtEnableDebug( false)
 
-PP_VER = '2.7k2'
-PP_NVER = '2.7.11.2'
-MIN_MACH_VER = '2.5k1'
+PP_VER = '2.7k5'
+PP_NVER = '2.7.11.5'
+MIN_MACH_VER = '2.7j1'
 MACH_NAME = string.match( EgtGetCurrMachineDir(), "[^\\]+$")  -- si ricava il nome della macchina dal direttorio
 
 -- Carico i dati globali
@@ -224,7 +224,7 @@ local CId = EmtAxis {
       Stroke = {MinC, MaxC},
       Home = 0,
       Geo = 'C_AXIS/GEO',
-      Aux = {'C_AXIS/SOLID', 'C_AXIS/COLLISION'}}
+      Aux = {'C_AXIS/SOLID', 'C_AXIS/COLLISION', 'C_AXIS/COLLISION2'}}
 if NewTopC then
    local vtMove = Vector3d( 65,0,0)
    local SolidArmId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'SOLID'), 'ARM')
@@ -239,9 +239,13 @@ if NewTopC then
    local CollTopId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'COLLISION'), 'TOP')
    EgtMove( CollTopId, vtMove, GDB_RT.GLOB)
    EgtSetName( CollTopId, 'BOX')
+   local RefId = CollTopId + EgtGetInfo( CollTopId, 'Frame', 'i')
+   EgtSetInfo( RefId, 'CollSkip', 'C_TOP')
 else
    local CollTopId = EgtGetFirstNameInGroup( EgtGetFirstNameInGroup( CId, 'COLLISION'), 'TOP')
    EgtSetName( CollTopId, 'BOX')
+   local RefId = CollTopId + EgtGetInfo( CollTopId, 'Frame', 'i')
+   EgtSetInfo( RefId, 'CollSkip', 'C_TOP')
 end
 EmtAxis {
       Name = 'B',
@@ -561,13 +565,6 @@ if SecondToolChanger then
          TDir = X_AX(),
          ADir = -Y_AX(),
          Geo = 'BASE/T28'}
-   EmtTcPos {
-         Name = 'T101',
-         Parent = 'Base',
-         Pos = Point3d( -510.4, 113.2, -1160.8),
-         TDir = X_AX(),
-         ADir = Z_AX(),
-         Geo = 'BASE/T101S'}
 else
    if not SpecialBH then
       EmtTcPos {
@@ -577,14 +574,6 @@ else
             TDir = X_AX(),
             ADir = Z_AX(),
             Geo = 'BASE/T101'}
-   else
-      EmtTcPos {
-            Name = 'T101',
-            Parent = 'Base',
-            Pos = Point3d( -510.4, 113.2, -1160.8),
-            TDir = X_AX(),
-            ADir = Z_AX(),
-            Geo = 'BASE/T101S'}
    end
    if SecondSupport == 1 then
       -- supporto per punta
@@ -605,19 +594,6 @@ else
                            ADir = Z_AX(),
                            Geo = 'BASE/T111M'}
       EgtSetInfo( TcpSsId, 'Mortiser', true)
-   elseif SecondSupport == 3 then
-      -- supporto per rinvio angolare
-      local TcpSsId = EmtTcPos {
-                           Name = 'T91',
-                           Parent = 'Base',
-                           ExitNbr = 2,
-                           Pos1 = Point3d( -710.4-150, 113.2, -329.8-170),
-                           TDir1 = X_AX(),
-                           Pos2 = Point3d( -710.4+150, 113.2, -329.8-170),
-                           TDir2 = -X_AX(),
-                           ADir = Z_AX(),
-                           Geo = 'BASE/T91',
-                           Aux = 'BASE/T91_HS'}
    end
    if SpecialBH then
       EmtTcPos {
@@ -629,6 +605,37 @@ else
             Geo = 'BASE/T111S'}
    end
 end
+-- motosega in caso di magazzino 2 o SpecialBH
+if SpecialBH or SecondToolChanger then
+   local TcpSsId = EmtTcPos {
+                        Name = 'T101',
+                        Parent = 'Base',
+                        Pos = Point3d( -510.4, 113.2, -1160.8),
+                        TDir = X_AX(),
+                        ADir = Z_AX(),
+                        Geo = 'BASE/T101S'}
+   -- spostamento in caso di magazzino 2
+   if SecondToolChanger then
+      EgtMove( TcpSsId, Vector3d( 0, 0, 140), GDB_RT.GLOB)
+   end
+end
+if SecondSupport == 3 then
+   -- supporto per rinvio angolare
+   local TcpSsId = EmtTcPos {
+                        Name = 'T91',
+                        Parent = 'Base',
+                        ExitNbr = 2,
+                        Pos1 = Point3d( -710.4-150, 113.2, -329.8-170),
+                        TDir1 = X_AX(),
+                        Pos2 = Point3d( -710.4+150, 113.2, -329.8-170),
+                        TDir2 = -X_AX(),
+                        ADir = Z_AX(),
+                        Geo = 'BASE/T91',
+                        Aux = 'BASE/T91_HS'}
+   if SecondToolChanger then
+      EgtMove( TcpSsId, Vector3d( 0, 0, -900), GDB_RT.GLOB)
+   end
+end
 
 -- Aggiusto posizioni geometriche
 local vtMove = Vector3d( 0, ( DeltaTabY - 913.16), ( DeltaTabZ + 830.037))
diff --git a/Essetre-FAST.nge b/Essetre-FAST.nge
index 99d481c..a6ea099 100644
Binary files a/Essetre-FAST.nge and b/Essetre-FAST.nge differ
diff --git a/MachNotes.ini b/MachNotes.ini
index 8b2d740..86b8a1f 100644
--- a/MachNotes.ini
+++ b/MachNotes.ini
@@ -22,7 +22,7 @@
 4=l,MaxOptSize,0
 
 [Mortising]
-0=d,MaxElev,0
+0=l,MaxElev,0
 
 [Chiseling]
 
diff --git a/Scripts/SetUp.lua b/Scripts/SetUp.lua
index 4a61cef..feb9184 100644
--- a/Scripts/SetUp.lua
+++ b/Scripts/SetUp.lua
@@ -51,6 +51,9 @@ if IsTC2Active then
                            {Pos = "Pos19",  TcPos = "T26",  Head = "H1", Group = "G3"},
                            {Pos = "Pos20",  TcPos = "T27",  Head = "H1", Group = "G3"},
                            {Pos = "Pos21",  TcPos = "T28",  Head = "H1", Group = "G3"}}
+   if EgtGetHeadId( 'H5') then
+      table.insert( PositionTableTC2, {Pos = "Pos22", TcPos = "T91", Head = "H5", Group = "G2"})
+   end
    EgtJoinTables( PositionTable, PositionTableTC2)
 else
    local SecSuppId = EgtGetTcPosId( 'T111')
diff --git a/ToolNotes.ini b/ToolNotes.ini
index 380b815..ffb1921 100644
--- a/ToolNotes.ini
+++ b/ToolNotes.ini
@@ -6,38 +6,38 @@
 
 [DRILL_STD]
 0=th,TH,
-1=d,STEP
-2=s,DOUBLE
+1=l,STEP
+2=tl,DOUBLE
 
 [SAW_STD]
 0=th,TH,
-1=d,STEP
-2=d,SIDESTEP
+1=l,STEP
+2=l,SIDESTEP
 3=b,LONGCUT
 
 [SAW_FLAT]
 0=th,TH,
-1=d,STEP
-2=d,SIDESTEP
+1=l,STEP
+2=l,SIDESTEP
 3=b,LONGCUT
 
 [MILL_STD]
 0=th,TH,
-1=d,STEP
-2=d,SIDESTEP
-3=d,SIDEDEPTH
-4=s,DOUBLE
-5=dr,TOOL_OVERHANG
+1=l,STEP
+2=l,SIDESTEP
+3=l,SIDEDEPTH
+4=tl,DOUBLE
+5=lr,TOOL_OVERHANG
 
 [MILL_NOTIP]
 0=th,TH,
-1=d,STEP
-2=d,SIDESTEP
-3=d,SIDEDEPTH
-4=s,DOUBLE
-5=dr,TOOL_OVERHANG
+1=l,STEP
+2=l,SIDESTEP
+3=l,SIDEDEPTH
+4=tl,DOUBLE
+5=lr,TOOL_OVERHANG
 
 [MORTISE_STD]
 0=b,MORTISE
-1=d,STEP
-2=d,SIDESTEP
+1=l,STEP
+2=l,SIDESTEP