diff --git a/MachiningDbWindow/MachiningDbV.xaml b/MachiningDbWindow/MachiningDbV.xaml
index f57a2bd..a0292cc 100644
--- a/MachiningDbWindow/MachiningDbV.xaml
+++ b/MachiningDbWindow/MachiningDbV.xaml
@@ -76,6 +76,10 @@
       <sys:Int32 x:Key="BlockedAxesRef">52</sys:Int32>
       <sys:Int32 x:Key="FaceUseType">53</sys:Int32>
       <sys:Int32 x:Key="InvertToolDir">54</sys:Int32>
+      <sys:Int32 x:Key="OscillEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscillHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscillRampL">60</sys:Int32>
+      <sys:Int32 x:Key="OscillHorizL">61</sys:Int32>
 
    </EgtWPFLib5:EgtCustomWindow.Resources>
 
@@ -1522,6 +1526,127 @@
                                                   ConverterParameter={StaticResource SelectedSolChoiceType}}"/>
 
                </Grid>
+
+               <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillEnable}}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+
+                  <TextBlock Text="{Binding OscillEnableTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillEnable}}"/>
+                  <CheckBox Name="OscillEnableChBx" Grid.Column="1" Height="20" Width="20" Margin="10,5,0,0"
+                                      IsChecked="{Binding Path=SelectedItem.OscillEnable,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource OscillEnable}}"/>
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=InvertTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+               </Grid>
+
+               <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillHeight}}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+
+                  <TextBlock Text="{Binding OscillHeightTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillHeight}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="OscillHeightTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OscillHeight,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource OscillHeight}}"/>
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=OscillHeightTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+               </Grid>
+
+               <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillRampL}}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+
+                  <TextBlock Text="{Binding OscillRampLTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillRampL}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="OscillRampLTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OscillRampL,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource OscillRampL}}"/>
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=OscillRampLTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+               </Grid>
+
+               <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillHorizL}}">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="1*"/>
+                     <ColumnDefinition Width="1*"/>
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="1*"/>
+                     <RowDefinition Height="1*"/>
+                  </Grid.RowDefinitions>
+
+                  <TextBlock Text="{Binding OscillHorizLTxBl}" Style="{StaticResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource OscillHorizL}}"/>
+                  <EgtWPFLib5:EgtTextBox Name="OscillHorizLTxBx" Grid.Column="1" Style="{StaticResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.OscillHorizL,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource OscillHorizL}}"/>
+                  <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+                  Content="{Binding ElementName=LiElevTxBx,
+                           Path=(Validation.Errors).CurrentItem,
+                           UpdateSourceTrigger=PropertyChanged}"/>-->
+
+               </Grid>
+
             </UniformGrid>
 
          </StackPanel>
diff --git a/MachiningDbWindow/MachiningDbVM.vb b/MachiningDbWindow/MachiningDbVM.vb
index 446b352..f31a2a8 100644
--- a/MachiningDbWindow/MachiningDbVM.vb
+++ b/MachiningDbWindow/MachiningDbVM.vb
@@ -381,6 +381,30 @@ Public Class MachiningDbVM
       End Get
    End Property
 
+   Public ReadOnly Property OscillEnableTxBl As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+      End Get
+   End Property
+
+   Public ReadOnly Property OscillHeightTxBl As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+      End Get
+   End Property
+
+   Public ReadOnly Property OscillRampLTxBl As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+      End Get
+   End Property
+
+   Public ReadOnly Property OscillHorizLTxBl As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 103)
+      End Get
+   End Property
+
 #End Region
 
 #Region "CONSTRUCTOR"
diff --git a/MachiningDbWindow/MachiningTreeView.vb b/MachiningDbWindow/MachiningTreeView.vb
index e297db2..acb9e9e 100644
--- a/MachiningDbWindow/MachiningTreeView.vb
+++ b/MachiningDbWindow/MachiningTreeView.vb
@@ -194,6 +194,27 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
+   Private m_IsModifiedOscillEnable As Boolean = False
+   Private m_OscillEnable As Boolean
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Invert
+   ''' </summary>
+   Public Property OscillEnable As Boolean
+      Get
+         Return m_OscillEnable
+      End Get
+      Set(value As Boolean)
+         If value <> m_OscillEnable Then
+            m_OscillEnable = value
+            Dim DbOscillEnable As Boolean = False
+            EgtMdbGetCurrMachiningParam(MCH_MP.TOOLINVERT, DbOscillEnable)
+            m_IsModifiedOscillEnable = If(value <> DbOscillEnable, True, False)
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("OscillEnable")
+         End If
+      End Set
+   End Property
+
    Private m_Type As MCH_MY
    ''' <summary>
    ''' Property that read from the Machining's database the Type
@@ -1546,6 +1567,75 @@ Public Class MachiningTreeViewItem
       End Set
    End Property
 
+   Private m_IsModifiedOscillHeight As Boolean = False
+   Private m_OscillHeight As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' </summary>
+   Public Property OscillHeight As String
+      Get
+         Return m_OscillHeight
+      End Get
+      Set(value As String)
+         If value <> m_OscillHeight Then
+            m_OscillHeight = value
+            Dim DbOscillHeight As Double = 0
+            Dim dValue As Double = 0
+            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, DbOscillHeight)
+            StringToLen(value, dValue)
+            m_IsModifiedVertFeed = Math.Abs(dValue - DbOscillHeight) > 10 * EPS_SMALL
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("OscillHeight")
+         End If
+      End Set
+   End Property
+
+   Private m_IsModifiedOscillRampL As Boolean = False
+   Private m_OscillRampL As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' </summary>
+   Public Property OscillRampL As String
+      Get
+         Return m_OscillRampL
+      End Get
+      Set(value As String)
+         If value <> m_OscillRampL Then
+            m_OscillRampL = value
+            Dim DbOscillRampL As Double = 0
+            Dim dValue As Double = 0
+            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, DbOscillRampL)
+            StringToLen(value, dValue)
+            m_IsModifiedVertFeed = Math.Abs(dValue - DbOscillRampL) > 10 * EPS_SMALL
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("OscillRampL")
+         End If
+      End Set
+   End Property
+
+   Private m_IsModifiedOscillHorizL As Boolean = False
+   Private m_OscillHorizL As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' </summary>
+   Public Property OscillHorizL As String
+      Get
+         Return m_OscillHorizL
+      End Get
+      Set(value As String)
+         If value <> m_OscillHorizL Then
+            m_OscillHorizL = value
+            Dim DbOscillHorizL As Double = 0
+            Dim dValue As Double = 0
+            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, DbOscillHorizL)
+            StringToLen(value, dValue)
+            m_IsModifiedVertFeed = Math.Abs(dValue - DbOscillHorizL) > 10 * EPS_SMALL
+            m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
+            NotifyPropertyChanged("OscillHorizL")
+         End If
+      End Set
+   End Property
+
    ' Variabile che indica se c'è un errore nel nome della lavorazione (ad esempio nome già utilizzato)
    Dim nErrorMachiningName As Integer = 0
    Friend m_IsModifiedName As Boolean = False
@@ -2106,6 +2196,7 @@ Public Class MachiningTreeViewItem
          Return m_IsModifiedInvert OrElse
                 m_IsModifiedLeaveTab OrElse
                 m_IsModifiedToolInvert OrElse
+                m_IsModifiedOscillEnable OrElse
                 m_IsModifiedSelectedWorkSide OrElse
                 m_IsModifiedSelectedHeadSide OrElse
                 m_IsModifiedSelectedLeadInType OrElse
@@ -2150,6 +2241,10 @@ Public Class MachiningTreeViewItem
                 m_IsModifiedStepIntArc OrElse
                 m_IsModifiedSideStep OrElse
                 m_IsModifiedVertFeed OrElse
+                m_IsModifiedOscillHeight OrElse
+                m_IsModifiedOscillRampL OrElse
+                m_IsModifiedOscillHorizL OrElse
+                m_IsModifiedOscillHeight OrElse
                 m_IsModifiedName OrElse
                 m_IsModifiedSelectedTool OrElse
                 m_IsModifiedDepthStr OrElse
@@ -2164,6 +2259,7 @@ Public Class MachiningTreeViewItem
       m_IsModifiedInvert = False
       m_IsModifiedLeaveTab = False
       m_IsModifiedToolInvert = False
+      m_IsModifiedOscillEnable = False
       m_IsModifiedSelectedWorkSide = False
       m_IsModifiedSelectedHeadSide = False
       m_IsModifiedSelectedLeadInType = False
@@ -2208,6 +2304,9 @@ Public Class MachiningTreeViewItem
       m_IsModifiedStepIntArc = False
       m_IsModifiedSideStep = False
       m_IsModifiedVertFeed = False
+      m_IsModifiedOscillHeight = False
+      m_IsModifiedOscillRampL = False
+      m_IsModifiedOscillHorizL = False
       m_IsModifiedName = False
       m_IsModifiedSelectedTool = False
       m_IsModifiedDepthStr = False
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 981a163..2491f43 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -67,6 +67,10 @@
       <sys:Int32 x:Key="ExpanderLeadIn">55</sys:Int32>
       <sys:Int32 x:Key="ExpanderLeadOut">56</sys:Int32>
       <sys:Int32 x:Key="ApproxGen">57</sys:Int32>
+      <sys:Int32 x:Key="OscillEnable">58</sys:Int32>
+      <sys:Int32 x:Key="OscillHeight">59</sys:Int32>
+      <sys:Int32 x:Key="OscillRampL">60</sys:Int32>
+      <sys:Int32 x:Key="OscillHorizL">61</sys:Int32>
    </UserControl.Resources>
 
    <StackPanel Name="OperationParametersStackPanel">
@@ -448,6 +452,37 @@
                </UniformGrid>
             </StackPanel>
          </Expander>
+         <Expander Visibility="{Binding Type,
+                                        Converter={StaticResource OperationParamVisibilityConverter},
+                                        ConverterParameter={StaticResource OscillEnable}}"
+               Style="{StaticResource ExpanderStyle}">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding OscillEnableMsg}"/>
+                  <CheckBox HorizontalAlignment="Center" IsChecked="{Binding OscillEnable}" />
+               </UniformGrid>
+            </Expander.Header>
+            <StackPanel>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource OscillHeight}}">
+                  <TextBlock Text="{Binding OscillHeightMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OscillHeight, UpdateSourceTrigger=PropertyChanged}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource OscillRampL}}">
+                  <TextBlock Text="{Binding OscillRampLMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OscillRampL, UpdateSourceTrigger=PropertyChanged}"/>
+               </UniformGrid>
+               <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                             Converter={StaticResource OperationParamVisibilityConverter},
+                                                             ConverterParameter={StaticResource OscillHorizL}}">
+                  <TextBlock Text="{Binding OscillHorizLMsg}"/>
+                  <EgtWPFLib5:EgtTextBox Text="{Binding OscillHorizL, UpdateSourceTrigger=PropertyChanged}"/>
+               </UniformGrid>
+            </StackPanel>
+         </Expander>
          <Expander Style="{StaticResource ExpanderStyle}">
             <Expander.Header>
                <TextBlock Text="{Binding ToolExpanderHeader}"/>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index aba487c..b1fd16e 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -74,6 +74,26 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
 
+   Private m_IsModifiedOscillEnable As Boolean = False
+   Private m_OscillEnable As Boolean
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Invert
+   ''' </summary>
+   Public Property OscillEnable As Boolean
+      Get
+         Return m_OscillEnable
+      End Get
+      Set(value As Boolean)
+         If value <> m_OscillEnable Then
+            m_OscillEnable = value
+            Dim OrigOscillEnable As Boolean = False
+            EgtGetMachiningParam(MCH_MP.TOOLINVERT, OrigOscillEnable)
+            m_IsModifiedOscillEnable = If(value <> OrigOscillEnable, True, False)
+            NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
+         End If
+      End Set
+   End Property
+
    Private m_Type As Integer
    ''' <summary>
    ''' Property that read from the Machining's database the Type
@@ -1371,6 +1391,72 @@ Public Class MachiningParameterExpanderVM
       End Set
    End Property
 
+   Private m_IsModifiedOscillHeight As Boolean = False
+   Private m_OscillHeight As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' </summary>
+   Public Property OscillHeight As String
+      Get
+         Return m_OscillHeight
+      End Get
+      Set(value As String)
+         If value <> m_OscillHeight Then
+            m_OscillHeight = value
+            Dim OrigOscillHeight As Double = 0
+            Dim dValue As Double = 0
+            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, OrigOscillHeight)
+            StringToLen(value, dValue)
+            m_IsModifiedVertFeed = Math.Abs(dValue - OrigOscillHeight) > 10 * EPS_SMALL
+            NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
+         End If
+      End Set
+   End Property
+
+   Private m_IsModifiedOscillRampL As Boolean = False
+   Private m_OscillRampL As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' </summary>
+   Public Property OscillRampL As String
+      Get
+         Return m_OscillRampL
+      End Get
+      Set(value As String)
+         If value <> m_OscillRampL Then
+            m_OscillRampL = value
+            Dim OrigOscillRampL As Double = 0
+            Dim dValue As Double = 0
+            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, OrigOscillRampL)
+            StringToLen(value, dValue)
+            m_IsModifiedVertFeed = Math.Abs(dValue - OrigOscillRampL) > 10 * EPS_SMALL
+            NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
+         End If
+      End Set
+   End Property
+
+   Private m_IsModifiedOscillHorizL As Boolean = False
+   Private m_OscillHorizL As String
+   ''' <summary>
+   ''' Property that read and write to the Machining's database the Vert Feed
+   ''' </summary>
+   Public Property OscillHorizL As String
+      Get
+         Return m_OscillHorizL
+      End Get
+      Set(value As String)
+         If value <> m_OscillHorizL Then
+            m_OscillHorizL = value
+            Dim OrigOscillHorizL As Double = 0
+            Dim dValue As Double = 0
+            EgtMdbGetCurrMachiningParam(MCH_MP.VERTFEED, OrigOscillHorizL)
+            StringToLen(value, dValue)
+            m_IsModifiedVertFeed = Math.Abs(dValue - OrigOscillHorizL) > 10 * EPS_SMALL
+            NotifyPropertyChanged("UpdateMachiningBtnIsEnabled")
+         End If
+      End Set
+   End Property
+
    Private m_IsModifiedDepthStr As Boolean = False
    Private m_DepthStr As String
    ''' <summary>
@@ -1848,6 +1934,30 @@ Public Class MachiningParameterExpanderVM
       End Get
    End Property
 
+   Public ReadOnly Property OscillEnableMsg As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+      End Get
+   End Property
+
+   Public ReadOnly Property OscillHeightMsg As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+      End Get
+   End Property
+
+   Public ReadOnly Property OscillRampLMsg As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+      End Get
+   End Property
+
+   Public ReadOnly Property OscillHorizLMsg As String
+      Get
+         Return EgtMsg(MSG_OPERATION + 15)       'Indietro
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #Region "METHODS"
diff --git a/Utility/TMDbParamVisibility.vb b/Utility/TMDbParamVisibility.vb
index 1ab3a93..5781bb1 100644
--- a/Utility/TMDbParamVisibility.vb
+++ b/Utility/TMDbParamVisibility.vb
@@ -16,17 +16,17 @@
    Friend WaterJet(25) As Visibility
 
    ' Array che contiene il valore della proprietà visibility per ogni campo della lavorazione
-   Friend Milling(57) As Visibility
-   Friend Drilling(57) As Visibility
-   Friend Sawing(57) As Visibility
-   Friend Pocketing(57) As Visibility
-   Friend Mortising(57) As Visibility
-   Friend Sawroughing(57) As Visibility
-   Friend Sawfinishing(57) As Visibility
-   Friend GenMachining(57) As Visibility
-   Friend Chiseling(57) As Visibility
-   Friend SurfFinishing(57) As Visibility
-   Friend WaterJetting(57) As Visibility
+   Friend Milling(61) As Visibility
+   Friend Drilling(61) As Visibility
+   Friend Sawing(61) As Visibility
+   Friend Pocketing(61) As Visibility
+   Friend Mortising(61) As Visibility
+   Friend Sawroughing(61) As Visibility
+   Friend Sawfinishing(61) As Visibility
+   Friend GenMachining(61) As Visibility
+   Friend Chiseling(61) As Visibility
+   Friend SurfFinishing(61) As Visibility
+   Friend WaterJetting(61) As Visibility
 
    ' Array che contiene il valore della proprietà visibility per ogni campo delle operazioni
    Friend OperationDisposition(49) As Visibility
@@ -371,6 +371,10 @@
       Milling(55) = Visibility.Visible                              ' Expander LeadIn
       Milling(56) = Visibility.Visible                              ' Expander LeadOut
       Milling(57) = Visibility.Collapsed                            ' ApproxGen
+      Milling(58) = Visibility.Visible                              ' OscillEnable
+      Milling(59) = Visibility.Visible                              ' OscillHeight
+      Milling(60) = Visibility.Visible                              ' OscillRampL
+      Milling(61) = Visibility.Visible                              ' OscillHorizL
 
       ' Parametri Drilling
       Drilling(0) = Visibility.Visible                              ' Invert
@@ -431,6 +435,10 @@
       Drilling(55) = Visibility.Collapsed                           ' Expander LeadIn
       Drilling(56) = Visibility.Collapsed                           ' Expander LeadOut
       Drilling(57) = Visibility.Collapsed                           ' ApproxGen
+      Drilling(58) = Visibility.Collapsed                           ' OscillEnable
+      Drilling(59) = Visibility.Collapsed                           ' OscillHeight
+      Drilling(60) = Visibility.Collapsed                           ' OscillRampL
+      Drilling(61) = Visibility.Collapsed                           ' OscillHorizL
 
       ' Parametri Sawing
       Sawing(0) = Visibility.Visible                                ' Invert
@@ -491,6 +499,10 @@
       Sawing(55) = Visibility.Visible                               ' Expander LeadIn
       Sawing(56) = Visibility.Visible                               ' Expander LeadOut
       Sawing(57) = Visibility.Collapsed                             ' ApproxGen
+      Sawing(58) = Visibility.Collapsed                             ' OscillEnable
+      Sawing(59) = Visibility.Collapsed                             ' OscillHeight
+      Sawing(60) = Visibility.Collapsed                             ' OscillRampL
+      Sawing(61) = Visibility.Collapsed                             ' OscillHorizL
 
       ' Parametri Pocketing
       Pocketing(0) = Visibility.Visible                             ' Invert
@@ -551,6 +563,10 @@
       Pocketing(55) = Visibility.Visible                            ' Expander LeadIn
       Pocketing(56) = Visibility.Visible                            ' Expander LeadOut
       Pocketing(57) = Visibility.Collapsed                          ' ApproxGen
+      Pocketing(58) = Visibility.Collapsed                          ' OscillEnable
+      Pocketing(59) = Visibility.Collapsed                          ' OscillHeight
+      Pocketing(60) = Visibility.Collapsed                          ' OscillRampL
+      Pocketing(61) = Visibility.Collapsed                          ' OscillHorizL
 
       ' Parametri Mortising
       Mortising(0) = Visibility.Visible                             ' Invert
@@ -611,6 +627,10 @@
       Mortising(55) = Visibility.Visible                            ' Expander LeadIn
       Mortising(56) = Visibility.Visible                            ' Expander LeadOut
       Mortising(57) = Visibility.Collapsed                          ' ApproxGen
+      Mortising(58) = Visibility.Collapsed                          ' OscillEnable
+      Mortising(59) = Visibility.Collapsed                          ' OscillHeight
+      Mortising(60) = Visibility.Collapsed                          ' OscillRampL
+      Mortising(61) = Visibility.Collapsed                          ' OscillHorizL
 
       ' Parametri Sawroughing
       Sawroughing(0) = Visibility.Visible                           ' Invert
@@ -671,6 +691,10 @@
       Sawroughing(55) = Visibility.Visible                          ' Expander LeadIn
       Sawroughing(56) = Visibility.Visible                          ' Expander LeadOut
       Sawroughing(57) = Visibility.Collapsed                        ' ApproxGen
+      Sawroughing(58) = Visibility.Collapsed                        ' OscillEnable
+      Sawroughing(59) = Visibility.Collapsed                        ' OscillHeight
+      Sawroughing(60) = Visibility.Collapsed                        ' OscillRampL
+      Sawroughing(61) = Visibility.Collapsed                        ' OscillHorizL
 
       ' Parametri Sawfinishing
       Sawfinishing(0) = Visibility.Visible                          ' Invert
@@ -731,6 +755,10 @@
       Sawfinishing(55) = Visibility.Visible                         ' Expander LeadIn
       Sawfinishing(56) = Visibility.Visible                         ' Expander LeadOut
       Sawfinishing(57) = Visibility.Collapsed                       ' ApproxGen
+      Sawfinishing(58) = Visibility.Collapsed                       ' OscillEnable
+      Sawfinishing(59) = Visibility.Collapsed                       ' OscillHeight
+      Sawfinishing(60) = Visibility.Collapsed                       ' OscillRampL
+      Sawfinishing(61) = Visibility.Collapsed                       ' OscillHorizL
 
       ' Parametri GenMachining
       GenMachining(0) = Visibility.Visible                          ' Invert
@@ -791,6 +819,10 @@
       GenMachining(55) = Visibility.Collapsed                       ' Expander LeadIn
       GenMachining(56) = Visibility.Collapsed                       ' Expander LeadOut
       GenMachining(57) = Visibility.Collapsed                       ' ApproxGen
+      GenMachining(58) = Visibility.Collapsed                       ' OscillEnable
+      GenMachining(59) = Visibility.Collapsed                       ' OscillHeight
+      GenMachining(60) = Visibility.Collapsed                       ' OscillRampL
+      GenMachining(61) = Visibility.Collapsed                       ' OscillHorizL
 
       ' Parametri Chiseling
       Chiseling(0) = Visibility.Visible                          ' Invert
@@ -851,6 +883,10 @@
       Chiseling(55) = Visibility.Collapsed                       ' Expander LeadIn
       Chiseling(56) = Visibility.Visible                         ' Expander LeadOut
       Chiseling(57) = Visibility.Collapsed                       ' ApproxGen
+      Chiseling(58) = Visibility.Collapsed                       ' OscillEnable
+      Chiseling(59) = Visibility.Collapsed                       ' OscillHeight
+      Chiseling(60) = Visibility.Collapsed                       ' OscillRampL
+      Chiseling(61) = Visibility.Collapsed                       ' OscillHorizL
 
       ' Parametri SurfFinishing
       SurfFinishing(0) = Visibility.Visible                      ' Invert
@@ -911,6 +947,10 @@
       SurfFinishing(55) = Visibility.Visible                     ' Expander LeadIn
       SurfFinishing(56) = Visibility.Visible                     ' Expander LeadOut
       SurfFinishing(57) = Visibility.Visible                     ' ApproxGen
+      SurfFinishing(58) = Visibility.Collapsed                   ' OscillEnable
+      SurfFinishing(59) = Visibility.Collapsed                   ' OscillHeight
+      SurfFinishing(60) = Visibility.Collapsed                   ' OscillRampL
+      SurfFinishing(61) = Visibility.Collapsed                   ' OscillHorizL
 
       ' Parametri WaterJetting
       WaterJetting(0) = Visibility.Visible                       ' Invert
@@ -971,6 +1011,10 @@
       WaterJetting(55) = Visibility.Visible                      ' Expander LeadIn
       WaterJetting(56) = Visibility.Visible                      ' Expander LeadOut
       WaterJetting(57) = Visibility.Collapsed                    ' ApproxGen
+      WaterJetting(58) = Visibility.Collapsed                    ' OscillEnable
+      WaterJetting(59) = Visibility.Collapsed                    ' OscillHeight
+      WaterJetting(60) = Visibility.Collapsed                    ' OscillRampL
+      WaterJetting(61) = Visibility.Collapsed                    ' OscillHorizL
 
       ' Parametri OperationDisposition
       OperationDisposition(0) = Visibility.Collapsed