diff --git a/LuaLibs/CalcMachParamFromSW.lua b/LuaLibs/CalcMachParamFromSW.lua
index b8bace5..c58f37f 100644
--- a/LuaLibs/CalcMachParamFromSW.lua
+++ b/LuaLibs/CalcMachParamFromSW.lua
@@ -29,6 +29,7 @@ local nResultLayerId = EgtGetFirstNameInGroup( GDB_ID.ROOT, LAY_TFSCALC)
 if not nResultLayerId then
    nResultLayerId = EgtGroup( GDB_ID.ROOT)
    EgtSetName( nResultLayerId, LAY_TFSCALC)
+   EgtSetLevel( nResultLayerId, GDB_LV.SYSTEM)
 end
 -- recupero Speed minima e massima dalla macchina
 local sMachIni = EgtGetCurrMachineDir() .. '\\' .. EgtGetCurrMachineName() .. '.ini'
@@ -53,8 +54,6 @@ while nPartId do
    local nLayerIndex = 1
    local nLayerId = EgtGetFirstNameInGroup( nPartId, SLICE_LAYER .. nLayerIndex)
    while nLayerId do
-      local sLayerName = EgtGetName( nLayerId)
-      local nLayerIndex = tonumber( sLayerName:sub( #SLICE_LAYER + 1))
       -- rimuovo eventuale info precedente del tempo di attesa
       EgtRemoveInfo( nLayerId, KEY_WAITING_TIME)
       -- calcolo lunghezza totale del layer
diff --git a/LuaLibs/RunGcodeGenerate.lua b/LuaLibs/RunGcodeGenerate.lua
index 718bc56..e5918c4 100644
--- a/LuaLibs/RunGcodeGenerate.lua
+++ b/LuaLibs/RunGcodeGenerate.lua
@@ -104,6 +104,9 @@ function RunGcodeGenerate.Exec()
    end
 
    -- Salvo il progetto
+   local sFilePath = EgtGetCurrFilePath()
+   sFilePath = EgtChangePathExtension( sFilePath, 'nge')
+   EgtSetCurrFilePath( sFilePath)
    EgtSaveFile()
 
    -- Genero il programma CN
diff --git a/LuaLibs/RunShowManager.lua b/LuaLibs/RunShowManager.lua
index 1764909..f4f257f 100644
--- a/LuaLibs/RunShowManager.lua
+++ b/LuaLibs/RunShowManager.lua
@@ -1,4 +1,4 @@
--- RunShowManager.lua by Egaltech s.r.l. 2022/07/03
+-- RunShowManager.lua by Egaltech s.r.l. 2022/09/15
 -- Gestione visualizzazione per Stampa 3d
 
 -- Tabella per definizione modulo
@@ -37,6 +37,7 @@ function RunShowManager.Exec()
    if not nViewId then
       nViewId = EgtGroup( GDB_ID.ROOT)
       EgtSetName( nViewId, VIEWPARAMS)
+      EgtSetLevel( nViewId, GDB_LV.SYSTEM)
    else
       bImportedSolid = EgtGetInfo( nViewId, IMPORTED_SOLID, 'b')
       bOuterCrv = EgtGetInfo( nViewId, OUTER_CRV, 'b')
diff --git a/LuaLibs/RunSlicing.lua b/LuaLibs/RunSlicing.lua
index 20592d0..02d10f1 100644
--- a/LuaLibs/RunSlicing.lua
+++ b/LuaLibs/RunSlicing.lua
@@ -1,4 +1,4 @@
--- RunSlicing.lua by Egaltech s.r.l. 2022/07/03
+-- RunSlicing.lua by Egaltech s.r.l. 2022/09/15
 -- Calcoli prima fase per Stampa 3d
 
 -- Tabella per definizione modulo
@@ -210,12 +210,21 @@ local function RemoveOldSlices( nPartId)
    end
 end
 
+---------------------------------------------------------------------
+local function RemoveOldTFS()
+   local nTFSCalcId = EgtGetFirstNameInGroup( GDB_ID.ROOT, LAY_TFSCALC)
+   if nTFSCalcId then
+      EgtEmptyGroup( nTFSCalcId)
+   end
+end
+
 ---------------------------------------------------------------------
 local function SetViewInfo()
    local nViewId = EgtGetFirstNameInGroup( GDB_ID.ROOT, VIEWPARAMS)
    if not nViewId then
       nViewId = EgtGroup( GDB_ID.ROOT)
       EgtSetName( nViewId, VIEWPARAMS)
+      EgtSetLevel( nViewId, GDB_LV.SYSTEM)
    end
    EgtSetInfo( nViewId, IMPORTED_SOLID, false)
    EgtSetInfo( nViewId, OUTER_CRV, false)
@@ -297,6 +306,9 @@ function RunSlicing.Exec()
    -- Rimozione vecchi conti
    RemoveOldSlices( nPartId)
 
+   -- Rimozione vecchi TFS
+   RemoveOldTFS()
+
    -- Calcolo delle fette
    CSLICES.Exec( nPartId, nStmId, HMax)
    EgtDraw()