diff --git a/MachiningsDbWindow/MachiningTreeView.vb b/MachiningsDbWindow/MachiningTreeView.vb
index 8024457..c119c48 100644
--- a/MachiningsDbWindow/MachiningTreeView.vb
+++ b/MachiningsDbWindow/MachiningTreeView.vb
@@ -173,6 +173,27 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
+   Private m_IsModifiedToolInvert As Boolean = False
+   Private m_ToolInvert As Boolean = False
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Invert
+   ''' </summary>
+   Public Property InvertToolDir As Boolean
+      Get
+         Return m_ToolInvert
+      End Get
+      Set(value As Boolean)
+         If value <> m_ToolInvert Then
+            m_ToolInvert = value
+            Dim OrigToolInvert As Boolean = False
+            EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, OrigToolInvert)
+            m_IsModifiedToolInvert = If(value <> OrigToolInvert, True, False)
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("InvertToolDir")
+         End If
+      End Set
+   End Property
+
    Private m_Type As MCH_MY
    ''' <summary>
    ''' Property that read from the Machining's database the Type
@@ -350,8 +371,8 @@ Public Class MachiningTreeViewItem
                m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)(
                                           {New IdNameStruct(MCH_SAW_LO.CENT, EgtMsg(MSG_MACHININGSDBPAGE + 120)),
                                            New IdNameStruct(MCH_SAW_LO.STRICT, EgtMsg(MSG_MACHININGSDBPAGE + 125)),
-                                           New IdNameStruct(MCH_SAW_LO.EXT_CENT, EgtMsg(MSG_MACHININGSDBPAGE + 127)),
                                            New IdNameStruct(MCH_SAW_LO.OUT, EgtMsg(MSG_MACHININGSDBPAGE + 126)),
+                                           New IdNameStruct(MCH_SAW_LO.EXT_CENT, EgtMsg(MSG_MACHININGSDBPAGE + 127)),
                                            New IdNameStruct(MCH_SAW_LO.EXT_OUT, EgtMsg(MSG_MACHININGSDBPAGE + 128))})
             Case MCH_MY.MILLING
                m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)(
@@ -377,15 +398,16 @@ Public Class MachiningTreeViewItem
    Public Property SelectedLeadOutType As Integer
       Get
          If IsNothing(LeadOutTypeList) Then Return Nothing
-         Return IdNameStruct.IdFromInd(m_SelectedLeadOutType, LeadOutTypeList)
+         Return m_SelectedLeadOutType
       End Get
       Set(value As Integer)
          If value <> m_SelectedLeadOutType Then
             If Not IsNothing(LeadOutTypeList) Then
-               m_SelectedLeadOutType = IdNameStruct.IndFromId(value, LeadOutTypeList)
-               Dim DbLeadOutType As Integer = 0
-               EgtMdbGetCurrMachiningParam(MCH_MP.LEADOUTTYPE, DbLeadOutType)
-               m_IsModifiedSelectedLeadOutType = If(value <> DbLeadOutType, True, False)
+               m_SelectedLeadOutType = value
+               Dim OrigLeadOutType As Integer = 0
+               EgtMdbGetCurrMachiningParam(MCH_MP.LEADOUTTYPE, OrigLeadOutType)
+               OrigLeadOutType = IdNameStruct.IndFromId(OrigLeadOutType, LeadOutTypeList)
+               m_IsModifiedSelectedLeadOutType = If(value <> OrigLeadOutType, True, False)
                m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
                NotifyPropertyChanged("SelectedLeadOutType")
             End If
@@ -577,6 +599,59 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
+   'ObservableCollection che contiene le variabili per il combobox FaceUseType
+   Private m_FaceUseTypeList As New ObservableCollection(Of IdNameStruct)(
+                           {New IdNameStruct(MCH_MIL_FU.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 153)),
+                            New IdNameStruct(MCH_MIL_FU.PARAL_DOWN, EgtMsg(MSG_MACHININGSDBPAGE + 157) & EgtMsg(MSG_MACHININGSDBPAGE + 154)),
+                            New IdNameStruct(MCH_MIL_FU.PARAL_TOP, EgtMsg(MSG_MACHININGSDBPAGE + 158) & EgtMsg(MSG_MACHININGSDBPAGE + 154)),
+                            New IdNameStruct(MCH_MIL_FU.PARAL_FRONT, EgtMsg(MSG_MACHININGSDBPAGE + 159) & EgtMsg(MSG_MACHININGSDBPAGE + 154)),
+                            New IdNameStruct(MCH_MIL_FU.PARAL_BACK, EgtMsg(MSG_MACHININGSDBPAGE + 160) & EgtMsg(MSG_MACHININGSDBPAGE + 154)),
+                            New IdNameStruct(MCH_MIL_FU.PARAL_LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 161) & EgtMsg(MSG_MACHININGSDBPAGE + 154)),
+                            New IdNameStruct(MCH_MIL_FU.PARAL_RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 162) & EgtMsg(MSG_MACHININGSDBPAGE + 154)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_DOWN, EgtMsg(MSG_MACHININGSDBPAGE + 157) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_TOP, EgtMsg(MSG_MACHININGSDBPAGE + 158) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_FRONT, EgtMsg(MSG_MACHININGSDBPAGE + 159) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_BACK, EgtMsg(MSG_MACHININGSDBPAGE + 160) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 161) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 162) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTHO_CONT, EgtMsg(MSG_MACHININGSDBPAGE + 163) & EgtMsg(MSG_MACHININGSDBPAGE + 155)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_DOWN, EgtMsg(MSG_MACHININGSDBPAGE + 157) & EgtMsg(MSG_MACHININGSDBPAGE + 156)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_TOP, EgtMsg(MSG_MACHININGSDBPAGE + 158) & EgtMsg(MSG_MACHININGSDBPAGE + 156)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_FRONT, EgtMsg(MSG_MACHININGSDBPAGE + 159) & EgtMsg(MSG_MACHININGSDBPAGE + 156)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_BACK, EgtMsg(MSG_MACHININGSDBPAGE + 160) & EgtMsg(MSG_MACHININGSDBPAGE + 156)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 161) & EgtMsg(MSG_MACHININGSDBPAGE + 156)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 162) & EgtMsg(MSG_MACHININGSDBPAGE + 156)),
+                            New IdNameStruct(MCH_MIL_FU.ORTUP_CONT, EgtMsg(MSG_MACHININGSDBPAGE + 163) & EgtMsg(MSG_MACHININGSDBPAGE + 156))})
+   Public ReadOnly Property FaceUseTypeList As ObservableCollection(Of IdNameStruct)
+      Get
+         Return m_FaceUseTypeList
+      End Get
+   End Property
+
+   Private m_IsModifiedSelectedFaceUseType As Boolean = False
+   Private m_SelectedFaceUseType As Integer = 0
+
+   ' Proprietà che indica il FaceUseType (MCH_MIL_FU)
+   Public Property SelectedFaceUseType As Integer
+      Get
+         If IsNothing(FaceUseTypeList) Then Return Nothing
+         Return m_SelectedFaceUseType
+      End Get
+      Set(value As Integer)
+         If value <> m_SelectedFaceUseType Then
+            If Not IsNothing(FaceUseTypeList) Then
+               m_SelectedFaceUseType = value
+               Dim OrigFaceUseType As Integer = 0
+               EgtMdbGetCurrMachiningParam(MCH_MP.FACEUSE, OrigFaceUseType)
+               OrigFaceUseType = IdNameStruct.IndFromId(OrigFaceUseType, FaceUseTypeList)
+               m_IsModifiedSelectedFaceUseType = If(value <> OrigFaceUseType, True, False)
+               m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+               NotifyPropertyChanged("SelectedFaceUseType")
+            End If
+         End If
+      End Set
+   End Property
+
    'ObservableCollection che contiene le variabili per il combobox SolChoiceType
    Private m_SolChoiceTypeList As New ObservableCollection(Of IdNameStruct)(
                            {New IdNameStruct(MCH_SCC.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 105)),
@@ -1601,6 +1676,48 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
+   Private m_IsModifiedInitAngs As Boolean = False
+   Private m_InitAngs As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Initial Angles
+   ''' </summary>
+   Public Property InitAngs As String
+      Get
+         Return m_InitAngs
+      End Get
+      Set(value As String)
+         If value = String.Empty Or value <> m_InitAngs Then
+            m_InitAngs = value
+            Dim OrigInitAngs As String = String.Empty
+            EgtMdbGetCurrMachiningParam(MCH_MP.INITANGS, OrigInitAngs)
+            m_IsModifiedInitAngs = If(value <> OrigInitAngs, True, False)
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("InitAngs")
+         End If
+      End Set
+   End Property
+
+   Private m_IsModifiedBlockedAxis As Boolean = False
+   Private m_BlockedAxis As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Initial Angles
+   ''' </summary>
+   Public Property BlockedAxis As String
+      Get
+         Return m_BlockedAxis
+      End Get
+      Set(value As String)
+         If value = String.Empty Or value <> m_BlockedAxis Then
+            m_BlockedAxis = value
+            Dim OrigBlockedAxis As String = String.Empty
+            EgtMdbGetCurrMachiningParam(MCH_MP.BLOCKEDAXIS, OrigBlockedAxis)
+            m_IsModifiedBlockedAxis = If(value <> OrigBlockedAxis, True, False)
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("BlockedAxis")
+         End If
+      End Set
+   End Property
+
 #End Region    ' Machining Property
 
 #Region "Constructors"
@@ -1622,6 +1739,7 @@ Public Class MachiningTreeViewItem
       ReadSelectedTool()
       EgtMdbGetCurrMachiningParam(MCH_MP.INVERT, Invert)
       EgtMdbGetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab)
+      EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, InvertToolDir)
       EgtMdbGetCurrMachiningParam(MCH_MP.WORKSIDE, nValue)
       SelectedWorkSide = If(IsNothing(WorkSideList), nValue, IdNameStruct.IndFromId(nValue, WorkSideList))
       EgtMdbGetCurrMachiningParam(MCH_MP.HEADSIDE, nValue)
@@ -1631,7 +1749,7 @@ Public Class MachiningTreeViewItem
       EgtMdbGetCurrMachiningParam(MCH_MP.EXTLINKTYPE, nValue)
       SelectedExtLinkType = nValue
       EgtMdbGetCurrMachiningParam(MCH_MP.LEADOUTTYPE, nValue)
-      SelectedLeadOutType = nValue
+      SelectedLeadOutType = If(IsNothing(LeadOutTypeList), nValue, IdNameStruct.IndFromId(nValue, LeadOutTypeList))
       EgtMdbGetCurrMachiningParam(MCH_MP.CURVEUSE, nValue)
       SelectedCurveUse = nValue
       EgtMdbGetCurrMachiningParam(MCH_MP.STEPTYPE, nValue)
@@ -1640,6 +1758,8 @@ Public Class MachiningTreeViewItem
       SelectedSubType = If(IsNothing(SubTypeList), nValue, IdNameStruct.IndFromId(nValue, SubTypeList))
       EgtMdbGetCurrMachiningParam(MCH_MP.LEADLINKTYPE, nValue)
       SelectedLeadLinkType = nValue
+      EgtMdbGetCurrMachiningParam(MCH_MP.FACEUSE, nValue)
+      SelectedFaceUseType = If(IsNothing(FaceUseTypeList), nValue, IdNameStruct.IndFromId(nValue, FaceUseTypeList))
       EgtMdbGetCurrMachiningParam(MCH_MP.SOLCHOICETYPE, nValue)
       SelectedSolChoiceType = If(IsNothing(SolChoiceTypeList), nValue, IdNameStruct.IndFromId(nValue, SolChoiceTypeList))
       EgtMdbGetCurrMachiningParam(MCH_MP.SPEED, dValue)
@@ -1713,6 +1833,8 @@ Public Class MachiningTreeViewItem
       EgtMdbGetCurrMachiningParam(MCH_MP.DEPTH_STR, DepthStr)
       EgtMdbGetCurrMachiningParam(MCH_MP.UUID, m_Uuid)
       EgtMdbGetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes)
+      EgtMdbGetCurrMachiningParam(MCH_MP.INITANGS, InitAngs)
+      EgtMdbGetCurrMachiningParam(MCH_MP.BLOCKEDAXIS, BlockedAxis)
    End Sub
 
    Friend Sub ReadMachiningName()
@@ -1753,6 +1875,7 @@ Public Class MachiningTreeViewItem
       Dim dValue As Double = 0
       EgtMdbSetCurrMachiningParam(MCH_MP.INVERT, Invert)
       EgtMdbSetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab)
+      EgtMdbSetCurrMachiningParam(MCH_MP.TOOLINVERT, InvertToolDir)
       EgtMdbSetCurrMachiningParam(MCH_MP.TYPE, Type)
       nValue = If(IsNothing(WorkSideList), m_SelectedWorkSide, IdNameStruct.IdFromInd(m_SelectedWorkSide, WorkSideList))
       EgtMdbSetCurrMachiningParam(MCH_MP.WORKSIDE, nValue)
@@ -1760,12 +1883,15 @@ Public Class MachiningTreeViewItem
       EgtMdbSetCurrMachiningParam(MCH_MP.HEADSIDE, nValue)
       EgtMdbSetCurrMachiningParam(MCH_MP.LEADINTYPE, SelectedLeadInType)
       EgtMdbSetCurrMachiningParam(MCH_MP.EXTLINKTYPE, SelectedExtLinkType)
-      EgtMdbSetCurrMachiningParam(MCH_MP.LEADOUTTYPE, SelectedLeadOutType)
+      nValue = If(IsNothing(LeadOutTypeList), m_SelectedLeadOutType, IdNameStruct.IdFromInd(m_SelectedLeadOutType, LeadOutTypeList))
+      EgtMdbSetCurrMachiningParam(MCH_MP.LEADOUTTYPE, nValue)
       EgtMdbSetCurrMachiningParam(MCH_MP.CURVEUSE, SelectedCurveUse)
       EgtMdbSetCurrMachiningParam(MCH_MP.STEPTYPE, SelectedStepType)
       nValue = If(IsNothing(SubTypeList), m_SelectedSubType, IdNameStruct.IdFromInd(m_SelectedSubType, SubTypeList))
       EgtMdbSetCurrMachiningParam(MCH_MP.SUBTYPE, nValue)
       EgtMdbSetCurrMachiningParam(MCH_MP.LEADLINKTYPE, SelectedLeadLinkType)
+      nValue = If(IsNothing(FaceUseTypeList), m_SelectedFaceUseType, IdNameStruct.IdFromInd(m_SelectedFaceUseType, FaceUseTypeList))
+      EgtMdbSetCurrMachiningParam(MCH_MP.FACEUSE, nValue)
       nValue = If(IsNothing(SolChoiceTypeList), m_SelectedSolChoiceType, IdNameStruct.IdFromInd(m_SelectedSolChoiceType, SolChoiceTypeList))
       EgtMdbSetCurrMachiningParam(MCH_MP.SOLCHOICETYPE, nValue)
       StringToDouble(Speed, dValue)
@@ -1843,6 +1969,8 @@ Public Class MachiningTreeViewItem
       End If
       EgtMdbSetCurrMachiningParam(MCH_MP.DEPTH_STR, DepthStr)
       EgtMdbSetCurrMachiningParam(MCH_MP.USERNOTES, UserNotes)
+      EgtMdbSetCurrMachiningParam(MCH_MP.INITANGS, InitAngs)
+      EgtMdbSetCurrMachiningParam(MCH_MP.BLOCKEDAXIS, BlockedAxis)
    End Sub
 
    Public Sub WriteMachiningName()
@@ -1904,23 +2032,67 @@ Public Class MachiningTreeViewItem
 
    Public ReadOnly Property IsModified() As Boolean
       Get
-         Return m_IsModifiedInvert OrElse m_IsModifiedLeaveTab OrElse m_IsModifiedSelectedWorkSide OrElse m_IsModifiedSelectedHeadSide OrElse m_IsModifiedSelectedLeadInType OrElse
-                m_IsModifiedSelectedExtLinkType OrElse m_IsModifiedSelectedLeadOutType OrElse m_IsModifiedSelectedCurveUse OrElse m_IsModifiedSelectedStepType OrElse
-                m_IsModifiedSelectedSubType OrElse m_IsModifiedSelectedLeadLinkType OrElse m_IsModifiedSelectedSolChoiceType OrElse
-                m_IsModifiedSpeed OrElse m_IsModifiedFeed OrElse m_IsModifiedStartFeed OrElse
-                m_IsModifiedEndFeed OrElse m_IsModifiedTipFeed OrElse m_IsModifiedOffSr OrElse m_IsModifiedOffSl OrElse m_IsModifiedSideAngle OrElse m_IsModifiedApprox OrElse
-                m_IsModifiedStartPos OrElse m_IsModifiedStartSlowLen OrElse m_IsModifiedEndSlowLen OrElse m_IsModifiedThrouAddLen OrElse m_IsModifiedStepPar OrElse
-                m_IsModifiedReturnPos OrElse m_IsModifiedTabLen OrElse m_IsModifiedTabDist OrElse m_IsModifiedTabHeight OrElse m_IsModifiedTabAngle OrElse
-                m_IsModifiedLiTang OrElse m_IsModifiedLiPerp OrElse m_IsModifiedLiElev OrElse m_IsModifiedLiCompLen OrElse m_IsModifiedLoTang OrElse m_IsModifiedLoPerp OrElse
-                m_IsModifiedLoElev OrElse m_IsModifiedLoCompLen OrElse m_IsModifiedStartAddLen OrElse m_IsModifiedEndAddLen OrElse m_IsModifiedStepExtArc OrElse
-                m_IsModifiedStepIntArc OrElse m_IsModifiedSideStep OrElse m_IsModifiedVertFeed OrElse m_IsModifiedName OrElse m_IsModifiedSelectedTool OrElse
-                m_IsModifiedDepthStr OrElse m_IsModifiedUserNotes OrElse m_IsModifiedOverLap
+         Return m_IsModifiedInvert OrElse
+                m_IsModifiedLeaveTab OrElse
+                m_IsModifiedToolInvert OrElse
+                m_IsModifiedSelectedWorkSide OrElse
+                m_IsModifiedSelectedHeadSide OrElse
+                m_IsModifiedSelectedLeadInType OrElse
+                m_IsModifiedSelectedExtLinkType OrElse
+                m_IsModifiedSelectedLeadOutType OrElse
+                m_IsModifiedSelectedCurveUse OrElse
+                m_IsModifiedSelectedStepType OrElse
+                m_IsModifiedSelectedSubType OrElse
+                m_IsModifiedSelectedLeadLinkType OrElse
+                m_IsModifiedSelectedFaceUseType OrElse
+                m_IsModifiedSelectedSolChoiceType OrElse
+                m_IsModifiedSpeed OrElse
+                m_IsModifiedFeed OrElse
+                m_IsModifiedStartFeed OrElse
+                m_IsModifiedEndFeed OrElse
+                m_IsModifiedTipFeed OrElse
+                m_IsModifiedOffSr OrElse
+                m_IsModifiedOffSl OrElse
+                m_IsModifiedSideAngle OrElse
+                m_IsModifiedApprox OrElse
+                m_IsModifiedStartPos OrElse
+                m_IsModifiedStartSlowLen OrElse
+                m_IsModifiedEndSlowLen OrElse
+                m_IsModifiedThrouAddLen OrElse
+                m_IsModifiedStepPar OrElse
+                m_IsModifiedReturnPos OrElse
+                m_IsModifiedTabLen OrElse
+                m_IsModifiedTabDist OrElse
+                m_IsModifiedTabHeight OrElse
+                m_IsModifiedTabAngle OrElse
+                m_IsModifiedLiTang OrElse
+                m_IsModifiedLiPerp OrElse
+                m_IsModifiedLiElev OrElse
+                m_IsModifiedLiCompLen OrElse
+                m_IsModifiedLoTang OrElse
+                m_IsModifiedLoPerp OrElse
+                m_IsModifiedLoElev OrElse
+                m_IsModifiedLoCompLen OrElse
+                m_IsModifiedStartAddLen OrElse
+                m_IsModifiedEndAddLen OrElse
+                m_IsModifiedStepExtArc OrElse
+                m_IsModifiedStepIntArc OrElse
+                m_IsModifiedSideStep OrElse
+                m_IsModifiedVertFeed OrElse
+                m_IsModifiedName OrElse
+                m_IsModifiedSelectedTool OrElse
+                m_IsModifiedDepthStr OrElse
+                m_IsModifiedUserNotes OrElse
+                m_IsModifiedOverLap OrElse
+                m_IsModifiedInitAngs OrElse
+                m_IsModifiedBlockedAxis
       End Get
    End Property
 
    Public Sub IsModifiedReset()
       m_IsModifiedInvert = False
       m_IsModifiedLeaveTab = False
+      m_IsModifiedToolInvert = False
       m_IsModifiedSelectedWorkSide = False
       m_IsModifiedSelectedHeadSide = False
       m_IsModifiedSelectedLeadInType = False
@@ -1930,6 +2102,8 @@ Public Class MachiningTreeViewItem
       m_IsModifiedSelectedStepType = False
       m_IsModifiedSelectedSubType = False
       m_IsModifiedSelectedLeadLinkType = False
+      m_IsModifiedSelectedFaceUseType = False
+      m_IsModifiedSelectedSolChoiceType = False
       m_IsModifiedSpeed = False
       m_IsModifiedFeed = False
       m_IsModifiedStartFeed = False
@@ -1968,6 +2142,8 @@ Public Class MachiningTreeViewItem
       m_IsModifiedDepthStr = False
       m_IsModifiedUserNotes = False
       m_IsModifiedOverLap = False
+      m_IsModifiedInitAngs = False
+      m_IsModifiedBlockedAxis = False
    End Sub
 
    Private Shared ReadOnly ValidatedProperties() As String = {"Speed", "NamePar"}
diff --git a/MachiningsDbWindow/MachiningsDbView.xaml b/MachiningsDbWindow/MachiningsDbView.xaml
index 938ccb7..818719d 100644
--- a/MachiningsDbWindow/MachiningsDbView.xaml
+++ b/MachiningsDbWindow/MachiningsDbView.xaml
@@ -1392,7 +1392,7 @@
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource AxRotRef}}"/>
                   <EgtWPFLib5:EgtTextBox Name="AxRotRefTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.AxRotRef,
+                                   Text="{Binding Path=SelectedItem.InitAngs,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
@@ -1422,7 +1422,7 @@
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource BlockedAxesRef}}"/>
                   <EgtWPFLib5:EgtTextBox Name="BlockedAxesRefTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
-                                   Text="{Binding Path=SelectedItem.BlockedAxesRef,
+                                   Text="{Binding Path=SelectedItem.BlockedAxis,
                                          ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
                                    Visibility="{Binding Path=SelectedItem.Type,
                                                ElementName=MachiningsTreeView,
@@ -1454,7 +1454,7 @@
                   <ComboBox Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.FaceUseTypeList,
                                                       ElementName=MachiningsTreeView, Mode=OneWay}"
                           Style="{StaticResource MachiningsComboBox}"
-                         SelectedIndex="{Binding Path=SelectedItem.SelFaceUseType,
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedFaceUseType,
                                         ElementName=MachiningsTreeView}"
                          IsSynchronizedWithCurrentItem="True"
                          Visibility="{Binding Path=SelectedItem.Type,
diff --git a/MachiningsDbWindow/MachiningsDbViewModel.vb b/MachiningsDbWindow/MachiningsDbViewModel.vb
index 24b6f47..d1a117e 100644
--- a/MachiningsDbWindow/MachiningsDbViewModel.vb
+++ b/MachiningsDbWindow/MachiningsDbViewModel.vb
@@ -119,6 +119,30 @@ Namespace EgtCAM5
          End Get
       End Property
 
+      Public ReadOnly Property InvertToolDirTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 151)
+         End Get
+      End Property
+
+      Public ReadOnly Property FaceUseTypeTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 152)
+         End Get
+      End Property
+
+      Public ReadOnly Property AxRotRefTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 164)
+         End Get
+      End Property
+
+      Public ReadOnly Property BlockedAxesRefTxBl As String
+         Get
+            Return EgtMsg(MSG_MACHININGSDBPAGE + 165)
+         End Get
+      End Property
+
       Public ReadOnly Property SolChoiceTypeTxBl As String
          Get
             Return EgtMsg(MSG_MACHININGSDBPAGE + 104)
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index d3698cd..0b5f10b 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -13,7 +13,7 @@ Namespace EgtCAM5
       Private Sub StartNewMachining()
          m_NewMachining = True
          ' Smarco la geometria eventualmente marcata
-         If Not IsNothing(m_LastMarkedOperationId) Then EgtResetMark(m_LastMarkedOperationId)
+         If Not IsNothing(m_LastMarkedOperationId) Then EgtResetMark(EgtGetFirstNameInGroup(m_LastMarkedOperationId, "CL"))
          ' Deseleziono eventuali geometrie selezionate
          EgtDeselectAll()
          EgtDraw()
@@ -235,7 +235,6 @@ Namespace EgtCAM5
                ' Verifico se c'è l'operazione precedente 
                If m_LastMarkedOperationId <> GDB_ID.NULL Then
                   ' La de-evidenzio 
-                  'EgtResetMark(m_LastMarkedOperationId)
                   Dim bEnabModif As Boolean = EgtGetEnableModified()
                   EgtDisableModified()
                   EgtResetMark(EgtGetFirstNameInGroup(m_LastMarkedOperationId, "CL"))
@@ -387,7 +386,7 @@ Namespace EgtCAM5
                                                                     ListIsExpanded = True
                                                                  End Sub)
          Application.Msn.Register(Application.REMOVEMARKFROMLASTOPERATION, Sub()
-                                                                              EgtResetMark(m_LastMarkedOperationId)
+                                                                              EgtResetMark(EgtGetFirstNameInGroup(m_LastMarkedOperationId, "CL"))
                                                                            End Sub)
          Application.Msn.Register(Application.NEWMACHININGMODEISACTIVE, Sub(Params As NewMachOpParam)
                                                                            If Params.bActive Then
@@ -542,7 +541,7 @@ Namespace EgtCAM5
                   End If
                Else
                   ' Smarco e deseleziono la geometria selezionata
-                  EgtResetMark(m_LastMarkedOperationId)
+                  EgtResetMark(EgtGetFirstNameInGroup(m_LastMarkedOperationId, "CL"))
                   EgtDeselectAll()
                   EgtDraw()
                   ' Rimuovo l'operazione selezionata
diff --git a/SharedFieldsClass.vb b/SharedFieldsClass.vb
index 57e2b5b..25c84ab 100644
--- a/SharedFieldsClass.vb
+++ b/SharedFieldsClass.vb
@@ -299,7 +299,7 @@
       Milling(14) = Visibility.Visible                              ' TipFeed
       Milling(15) = Visibility.Visible                              ' OffSr
       Milling(16) = Visibility.Visible                              ' OffSl
-      Milling(17) = Visibility.Visible                              ' SideAngle
+      Milling(17) = Visibility.Collapsed                            ' SideAngle
       Milling(18) = Visibility.Collapsed                            ' Approx
       Milling(19) = Visibility.Visible                              ' StartPos
       Milling(20) = Visibility.Collapsed                            ' StartSlowLen
@@ -447,10 +447,10 @@
       Sawing(48) = Visibility.Collapsed                             ' OffsetStr
       Sawing(49) = Visibility.Collapsed                             ' SubType
       Sawing(50) = Visibility.Visible                               ' SelectedSolChoiceType
-      Sawing(51) = Visibility.Visible                                ' AxRotRef
-      Sawing(52) = Visibility.Visible                                ' BlockedAxesRef
-      Sawing(53) = Visibility.Collapsed                              ' FaceUseType
-      Sawing(54) = Visibility.Collapsed                              ' InvertToolDir
+      Sawing(51) = Visibility.Visible                               ' AxRotRef
+      Sawing(52) = Visibility.Visible                               ' BlockedAxesRef
+      Sawing(53) = Visibility.Collapsed                             ' FaceUseType
+      Sawing(54) = Visibility.Collapsed                             ' InvertToolDir
 
       ' Parametri Pocketing
       Pocketing(0) = Visibility.Visible                             ' Invert
@@ -470,7 +470,7 @@
       Pocketing(14) = Visibility.Visible                            ' TipFeed
       Pocketing(15) = Visibility.Visible                            ' OffSr
       Pocketing(16) = Visibility.Visible                            ' OffSl
-      Pocketing(17) = Visibility.Visible                            ' SideAngle
+      Pocketing(17) = Visibility.Collapsed                          ' SideAngle
       Pocketing(18) = Visibility.Collapsed                          ' Approx
       Pocketing(19) = Visibility.Visible                            ' StartPos
       Pocketing(20) = Visibility.Collapsed                          ' StartSlowLen
@@ -735,7 +735,7 @@
       GenMachining(51) = Visibility.Visible                         ' AxRotRef
       GenMachining(52) = Visibility.Visible                         ' BlockedAxesRef
       GenMachining(53) = Visibility.Collapsed                       ' FaceUseType
-      GenMachining(54) = Visibility.Collapsed                       ' InvertToolDir
+      GenMachining(54) = Visibility.Visible                         ' InvertToolDir
 
       ' Parametri Chiseling
       Chiseling(0) = Visibility.Visible                          ' Invert