diff --git a/BeamMachiningsWindow/BeamMachiningsWindowVM.vb b/BeamMachiningsWindow/BeamMachiningsWindowVM.vb
index b559c26..bd3e6f6 100644
--- a/BeamMachiningsWindow/BeamMachiningsWindowVM.vb
+++ b/BeamMachiningsWindow/BeamMachiningsWindowVM.vb
@@ -12,6 +12,7 @@ Public Class BeamMachiningsWindowVM
    Private Const MACH_MILLING As String = "Milling"
    Private Const MACH_POCKETING As String = "Pocketing"
    Private Const MACH_SAWING As String = "Sawing"
+   Private Const MACH_SURFACING As String = "Surfacing"
    Private Const ONCONST As String = "On"
    Private Const NAME As String = "Name"
    Private Const TYPE As String = "Type"
@@ -159,6 +160,11 @@ Public Class BeamMachiningsWindowVM
       m_TableTemplateFilePath = sTabTemplPath
       ' Imposto se per travi o pareti
       m_IsBeam = bIsBeam
+      ' Se previste, aggiungo lavorazioni di superfici
+      Dim sDummy As String = ""
+      If EgtUILib.GetPrivateProfileString( MACH_SURFACING, "1", "", sDummy, m_MachTypeFilePath) > 0 Then
+         m_MachiningList.Add(MACH_SURFACING)
+      End If
       ' Seleziono la prima lavorazione
       If m_MachiningList.Count > 0 Then
          SetSelMachining( m_MachiningList(0))
@@ -189,6 +195,9 @@ Public Class BeamMachiningsWindowVM
             LoadMachiningListByType(MachiningList, MCH_MY.POCKETING, 0)
          Case MACH_SAWING
             LoadMachiningListByType(MachiningList, MCH_MY.MORTISING, 0)
+         Case MACH_SURFACING
+            LoadMachiningListByType(MachiningList, MCH_MY.SURFROUGHING, 0)
+            LoadMachiningListByType(MachiningList, MCH_MY.SURFFINISHING, 0, False)
       End Select
       GridLine.SetNamesList(New ObservableCollection(Of String)(MachiningList))
       Return True
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 2074c0a..94721c7 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -170,6 +170,7 @@ Module ConstIni
    Public Const K_SELGEOMSAWFINISHING As String = "SelGeomSawFinishing"
    Public Const K_SELGEOMGENMACHINING As String = "SelGeomGenMachining"
    Public Const K_SELGEOMCHISELING As String = "SelGeomChiseling"
+   Public Const K_SELGEOMSURFFINISHING As String = "SelGeomSurfFinishing"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
    Public Const K_SHOWONLYTABLE As String = "ShowOnlyTable"
    Public Const K_MOVETHROUGHDISPS As String = "MoveThroughDisps"
diff --git a/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb
index faf0a75..7d3a894 100644
--- a/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/MachiningsTreeViewExpander/MachiningTreeExpanderVM.vb
@@ -140,6 +140,16 @@ Public Class MachiningTreeExpanderVM
             Return EgtMsg(MSG_MACHININGSDBPAGE + 6)
          Case MCH_MY.SAWFINISHING
             Return EgtMsg(MSG_MACHININGSDBPAGE + 7)
+         Case MCH_MY.GENMACHINING
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 8)
+         Case MCH_MY.CHISELING
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 9)
+         Case MCH_MY.SURFROUGHING
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 10)
+         Case MCH_MY.SURFFINISHING
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 11)
+         Case MCH_MY.WATERJETTING
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 12)
          Case Else
             Return "Mach"
       End Select
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index 961b811..45e88bb 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -132,7 +132,8 @@ Friend Module OptionModule
       m_SelGeomGenMachining = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
       Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMCHISELING, -1)
       m_SelGeomChiseling = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
-      m_SelGeomSurfFinishing = SceneSelModeOpt.PARTCURVES
+      Temp = GetPrivateProfileInt(S_MACH, K_SELGEOMSURFFINISHING, -1)
+      m_SelGeomSurfFinishing = If(Temp < 0 Or Temp > 3, SceneSelModeOpt.PARTCURVESANDSURFACES, DirectCast(Temp, SceneSelModeOpt))
       m_SelGeomWaterJetting = SceneSelModeOpt.PARTCURVES
       ' Inizializzo variabile che indica posizione nuova operazione di lavorazione
       m_bNewMachiningIsLastOne = If(GetPrivateProfileInt(S_OPTIONS, K_NEWMACHININGISLASTONE, 0) <> 0, True, False)