diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index d236553..160597a 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -69,5 +69,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.10.1")>
-<Assembly: AssemblyFileVersion("2.1.10.1")>
+<Assembly: AssemblyVersion("2.1.11.1")>
+<Assembly: AssemblyFileVersion("2.1.11.1")>
diff --git a/MyMachiningDbWindow/MyMachiningDbWindowV.xaml b/MyMachiningDbWindow/MyMachiningDbWindowV.xaml
index 7451650..8865315 100644
--- a/MyMachiningDbWindow/MyMachiningDbWindowV.xaml
+++ b/MyMachiningDbWindow/MyMachiningDbWindowV.xaml
@@ -77,7 +77,20 @@
       <sys:Int32 x:Key="StepSideAngBack">56</sys:Int32>
       <sys:Int32 x:Key="BackFeed">57</sys:Int32>
       <sys:Int32 x:Key="StepSideAng">58</sys:Int32>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
+        <sys:Int32 x:Key="ForwardAngle">59</sys:Int32>
+        <sys:Int32 x:Key="Probing">60</sys:Int32>
+        <sys:Int32 x:Key="ProbingMinDist">61</sys:Int32>
+        <sys:Int32 x:Key="ProbingMaxDist">62</sys:Int32>
+        <sys:Int32 x:Key="ExtCornType">63</sys:Int32>
+        <sys:Int32 x:Key="IntCornType">64</sys:Int32>
+        <sys:Int32 x:Key="CornSlowLen">65</sys:Int32>
+        <sys:Int32 x:Key="CornSlowPerc">66</sys:Int32>
+        <sys:Int32 x:Key="LiHole">67</sys:Int32>
+        <sys:Int32 x:Key="LiHoleRad">68</sys:Int32>
+        <sys:Int32 x:Key="LpTurns">69</sys:Int32>
+        <sys:Int32 x:Key="HpTurns">70</sys:Int32>
+        <sys:Int32 x:Key="ThicknessFeed">71</sys:Int32>
+    </EgtWPFLib5:EgtCustomWindow.Resources>
 
    <Grid>
       <Grid.ColumnDefinitions>
@@ -1616,9 +1629,347 @@
                                                   ConverterParameter={StaticResource SelectedSolChoiceType}}"/>
 
                </Grid>
+                
+                
+                
             </UniformGrid>
 
-            <DataGrid Name="AssociationDataGrid"
+                <UniformGrid Columns="2">
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ForwardAngle}}">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ForwardAngleTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ForwardAngle}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="ForwardAngleTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.ForwardAngle,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ForwardAngle}}"/>
+                    </Grid>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Probing}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ProbingTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource Probing}}"/>
+                        <CheckBox Name="ProbingChBx" Grid.Column="1"  Height="20" Width="20"  Margin="10,5,0,0"
+                                      IsChecked="{Binding Path=SelectedItem.Probing,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource Probing}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ProbingMinDist}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ProbingMinDistTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ProbingMinDist}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="ProbingMinDistTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.ProbingMinDist,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ProbingMinDist}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ProbingMaxDist}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ProbingMaxDistTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ProbingMaxDist}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="ProbingMaxDistTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.ProbingMaxDist,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ProbingMaxDist}}"/>
+                    </Grid>
+
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                    </Grid>
+                    
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ExtCornType}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding ExtCornTypeTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource ExtCornType}}"/>
+                        <ComboBox x:Name="ExtCornTypeCmBx" Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.ExtCornTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{DynamicResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedExtCornType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource ExtCornType}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource IntCornType}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding IntCornTypeTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource IntCornType}}"/>
+                        <ComboBox x:Name="IntCornTypeCmBx" Grid.Column="1" ItemsSource="{Binding Path=SelectedItem.IntCornTypeList,
+                                                      ElementName=MachiningsTreeView, Mode=OneWay}"
+                          Style="{DynamicResource MachiningsComboBox}"
+                         SelectedIndex="{Binding Path=SelectedItem.SelectedIntCornType,
+                                        ElementName=MachiningsTreeView}"
+                         IsSynchronizedWithCurrentItem="True"
+                         Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource IntCornType}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource CornSlowLen}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding CornSlowLenTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource CornSlowLen}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="CornSlowLenTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.CornSlowLen,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource CornSlowLen}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource CornSlowPerc}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding CornSlowPercTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource CornSlowPerc}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="CornSlowPercTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.CornSlowPerc,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource CornSlowPerc}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiHole}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LiHoleTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiHole}}"/>
+                        <CheckBox Name="LiHoleChBx" Grid.Column="1"  Height="20" Width="20"  Margin="10,5,0,0"
+                                      IsChecked="{Binding Path=SelectedItem.LiHole,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LiHole}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiHoleRad}}">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LiHoleRadTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LiHoleRad}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="LiHoleRadTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LiHoleRad,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LiHoleRad}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LpTurns}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding LpTurnsTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource LpTurns}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="LpTurnsTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.LpTurns,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource LpTurns}}"/>
+                    </Grid>
+
+                    <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource HpTurns}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="1*"/>
+                            <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+
+                        <TextBlock Text="{Binding HpTurnsTxBl}" Style="{DynamicResource MachiningsTextBlock}"
+                          Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                      Converter={StaticResource MachiningParamVisibilityConverter},
+                                      ConverterParameter={StaticResource HpTurns}}"/>
+                        <EgtWPFLib5:EgtTextBox x:Name="HpTurnsTxBx" Grid.Column="1" Style="{DynamicResource MachiningsTextBox}"
+                                      Text="{Binding Path=SelectedItem.HpTurns,
+                                            ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                      Visibility="{Binding Path=SelectedItem.Type,
+                                                  ElementName=MachiningsTreeView,
+                                                  Converter={StaticResource MachiningParamVisibilityConverter},
+                                                  ConverterParameter={StaticResource HpTurns}}"/>
+                    </Grid>
+
+                </UniformGrid>
+
+
+                <DataGrid Name="AssociationDataGrid"
                ItemsSource="{Binding Path=SelectedItem.MaterialList,
                                             ElementName=MachiningsTreeView}"
                SelectedItem="{Binding Path=SelectedItem.SelMaterial,
@@ -1662,7 +2013,7 @@
                
             </DataGrid>
 
-         </StackPanel>
+            </StackPanel>
          
                <Grid Grid.Row="2">
                   <Grid Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
@@ -1707,7 +2058,8 @@
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="1*"/>
                   <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
 
          <Grid.Resources>
             <!--Stile che modifica l'aspetto del messaggio d'errore-->
@@ -1883,7 +2235,8 @@
                      <RowDefinition Height="1*"/>
                   </Grid.RowDefinitions>
 
-                  <TextBlock Text="{Binding TipFeedTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                <TextBlock Text="{Binding Path=SelectedItem.TipFeedTxBl,
+                                         ElementName=MachiningsTreeView}" Style="{DynamicResource MachiningsToolTextBlock}"
                        Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
                                    Converter={StaticResource MachiningParamVisibilityConverter},
                                    ConverterParameter={StaticResource TipFeed}}"/>
@@ -2013,7 +2366,36 @@
                         UpdateSourceTrigger=PropertyChanged}"/>-->
 
                </Grid>
+
+            <Grid Grid.Column="0" Grid.Row="10">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock Text="{Binding ThicknessFeedTxBl}" Style="{DynamicResource MachiningsToolTextBlock}"
+                       Visibility="{Binding Path=SelectedItem.Type, ElementName=MachiningsTreeView,
+                                   Converter={StaticResource MachiningParamVisibilityConverter},
+                                   ConverterParameter={StaticResource ThicknessFeed}}"/>
+                <EgtWPFLib5:EgtTextBox x:Name="ThicknessFeedTxBx" Grid.Column="1" Style="{DynamicResource MachiningsToolTextBox}"
+                                   Text="{Binding Path=SelectedItem.ThicknessFeed,
+                                         ElementName=MachiningsTreeView, UpdateSourceTrigger=PropertyChanged}"
+                                   Visibility="{Binding Path=SelectedItem.Type,
+                                               ElementName=MachiningsTreeView,
+                                               Converter={StaticResource MachiningParamVisibilityConverter},
+                                               ConverterParameter={StaticResource ThicknessFeed}}"/>
+                <!--<ContentPresenter Grid.Row="1" Grid.ColumnSpan="2"
+               Content="{Binding ElementName=ThicknessFeedTxBx,
+                        Path=(Validation.Errors).CurrentItem,
+                        UpdateSourceTrigger=PropertyChanged}"/>-->
+
             </Grid>
+
+        </Grid>
          </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/Utility/OmagOFFICETMDbParamVisibility.vb b/Utility/OmagOFFICETMDbParamVisibility.vb
index 3f12ab3..a6d5f83 100644
--- a/Utility/OmagOFFICETMDbParamVisibility.vb
+++ b/Utility/OmagOFFICETMDbParamVisibility.vb
@@ -172,6 +172,34 @@ Class OmagOFFICETMDbParamVisibility
       Mill_NoTip(24) = Visibility.Visible                           ' UserNotes
       Mill_NoTip(25) = Visibility.Visible                           ' TcPOs
 
+      'Parametri Waterjet
+      Waterjet(0) = Visibility.Collapsed                              ' Corrector
+      Waterjet(1) = Visibility.Collapsed                              ' ExitPar
+      Waterjet(2) = Visibility.Collapsed                            ' Coolant
+      Waterjet(3) = Visibility.Collapsed                              ' CornRad
+      Waterjet(4) = Visibility.Visible                              ' Diam
+      Waterjet(5) = Visibility.Visible                              ' TotDiam
+      Waterjet(6) = Visibility.Visible                              ' Feed
+      Waterjet(7) = Visibility.Collapsed                              ' EndFeed
+      Waterjet(8) = Visibility.Collapsed                              ' StartFeed
+      Waterjet(9) = Visibility.Visible                              ' TipFeed
+      Waterjet(10) = Visibility.Visible                             ' Len
+      Waterjet(11) = Visibility.Visible                             ' TotLen
+      Waterjet(12) = Visibility.Visible                             ' MaxMat
+      Waterjet(13) = Visibility.Collapsed                             ' LonOffset
+      Waterjet(14) = Visibility.Visible                             ' RadOffset
+      Waterjet(15) = Visibility.Collapsed                             ' Speed
+      Waterjet(16) = Visibility.Collapsed                             ' SideAng
+      Waterjet(17) = Visibility.Collapsed                             ' MaxSpeed
+      Waterjet(18) = Visibility.Visible                             ' Thick
+      Waterjet(19) = Visibility.Collapsed                           ' MaxAbsorption
+      Waterjet(20) = Visibility.Collapsed                           ' MinFeed
+      Waterjet(21) = Visibility.Visible                             ' Draw
+      Waterjet(22) = Visibility.Visible                             ' Head
+      Waterjet(23) = Visibility.Visible                             ' NamePar
+      Waterjet(24) = Visibility.Collapsed                           ' UserNotes
+      Waterjet(25) = Visibility.Visible                             ' TcPOs
+
       ' Parametri Milling
       Milling(0) = Visibility.Collapsed                             ' Invert
       Milling(1) = Visibility.Collapsed                             ' LeaveTab
@@ -223,6 +251,30 @@ Class OmagOFFICETMDbParamVisibility
       Milling(47) = Visibility.Collapsed                            ' OverLapStr
       Milling(48) = Visibility.Collapsed                            ' OffsetStr
       Milling(49) = Visibility.Collapsed                            ' SubType
+      Milling(50) = Visibility.Collapsed                            ' SelectedSolChoiceType
+      Milling(51) = Visibility.Collapsed                            ' AxRotRef
+      Milling(52) = Visibility.Collapsed                            ' BlockedAxesRef
+      Milling(53) = Visibility.Collapsed                            ' FaceUseType
+      Milling(54) = Visibility.Collapsed                            ' InvertToolDir
+      Milling(55) = Visibility.Collapsed                            ' StepBack
+      Milling(56) = Visibility.Collapsed                            ' StepSideAngBack
+      Milling(57) = Visibility.Collapsed                            ' BackFeed
+      Milling(58) = Visibility.Collapsed                            ' StepSideAng
+      Milling(59) = Visibility.Collapsed                            ' ForwardAngle
+      Milling(60) = Visibility.Collapsed                            ' Probing
+      Milling(61) = Visibility.Collapsed                            ' ProbingMinDist
+      Milling(62) = Visibility.Collapsed                            ' ProbingMaxDist
+      Milling(63) = Visibility.Collapsed                            ' ExtCornType
+      Milling(64) = Visibility.Collapsed                            ' IntCornType
+      Milling(65) = Visibility.Collapsed                            ' CornSlowLen
+      Milling(66) = Visibility.Collapsed                            ' CornSlowPerc
+      Milling(67) = Visibility.Collapsed                            ' LiHole
+      Milling(68) = Visibility.Collapsed                            ' LiHoleRad
+      Milling(69) = Visibility.Collapsed                            ' LpTurns
+      Milling(70) = Visibility.Collapsed                            ' HpTurns
+      Milling(71) = Visibility.Collapsed                            ' ThicknessFeed
+      Milling(102) = Visibility.Collapsed                           ' Expander LeadIn
+      Milling(103) = Visibility.Collapsed                           ' Expander LeadOut
 
       ' Parametri Drilling
       Drilling(0) = Visibility.Collapsed                            ' Invert
@@ -275,6 +327,30 @@ Class OmagOFFICETMDbParamVisibility
       Drilling(47) = Visibility.Collapsed                           ' OverLapStr
       Drilling(48) = Visibility.Collapsed                           ' OffsetStr
       Drilling(49) = Visibility.Collapsed                           ' SubType
+      Drilling(50) = Visibility.Collapsed                           ' SelectedSolChoiceType
+      Drilling(51) = Visibility.Collapsed                           ' AxRotRef
+      Drilling(52) = Visibility.Collapsed                           ' BlockedAxesRef
+      Drilling(53) = Visibility.Collapsed                           ' FaceUseType
+      Drilling(54) = Visibility.Collapsed                           ' InvertToolDir
+      Drilling(55) = Visibility.Collapsed                           ' StepBack
+      Drilling(56) = Visibility.Collapsed                           ' StepSideAngBack
+      Drilling(57) = Visibility.Collapsed                           ' BackFeed
+      Drilling(58) = Visibility.Collapsed                           ' StepSideAng
+      Drilling(59) = Visibility.Collapsed                           ' ForwardAngle
+      Drilling(60) = Visibility.Collapsed                           ' Probing
+      Drilling(61) = Visibility.Collapsed                           ' ProbingMinDist
+      Drilling(62) = Visibility.Collapsed                           ' ProbingMaxDist
+      Drilling(63) = Visibility.Collapsed                           ' ExtCornType
+      Drilling(64) = Visibility.Collapsed                           ' IntCornType
+      Drilling(65) = Visibility.Collapsed                           ' CornSlowLen
+      Drilling(66) = Visibility.Collapsed                           ' CornSlowPerc
+      Drilling(67) = Visibility.Collapsed                           ' LiHole
+      Drilling(68) = Visibility.Collapsed                           ' LiHoleRad
+      Drilling(69) = Visibility.Collapsed                           ' LpTurns
+      Drilling(70) = Visibility.Collapsed                           ' HpTurns
+      Drilling(71) = Visibility.Collapsed                           ' ThicknessFeed
+      Drilling(102) = Visibility.Collapsed                          ' Expander LeadIn
+      Drilling(103) = Visibility.Collapsed                          ' Expander LeadOut
 
       ' Parametri Sawing
       Sawing(0) = Visibility.Visible                                ' Invert
@@ -327,6 +403,30 @@ Class OmagOFFICETMDbParamVisibility
       Sawing(47) = Visibility.Collapsed                             ' OverLapStr
       Sawing(48) = Visibility.Collapsed                             ' OffsetStr
       Sawing(49) = Visibility.Collapsed                             ' SubType
+      Sawing(50) = Visibility.Collapsed                             ' SelectedSolChoiceType
+      Sawing(51) = Visibility.Collapsed                             ' AxRotRef
+      Sawing(52) = Visibility.Collapsed                             ' BlockedAxesRef
+      Sawing(53) = Visibility.Collapsed                             ' FaceUseType
+      Sawing(54) = Visibility.Collapsed                             ' InvertToolDir
+      Sawing(55) = Visibility.Collapsed                             ' StepBack
+      Sawing(56) = Visibility.Collapsed                             ' StepSideAngBack
+      Sawing(57) = Visibility.Collapsed                             ' BackFeed
+      Sawing(58) = Visibility.Collapsed                             ' StepSideAng
+      Sawing(59) = Visibility.Collapsed                             ' ForwardAngle
+      Sawing(60) = Visibility.Collapsed                             ' Probing
+      Sawing(61) = Visibility.Collapsed                             ' ProbingMinDist
+      Sawing(62) = Visibility.Collapsed                             ' ProbingMaxDist
+      Sawing(63) = Visibility.Collapsed                             ' ExtCornType
+      Sawing(64) = Visibility.Collapsed                             ' IntCornType
+      Sawing(65) = Visibility.Collapsed                             ' CornSlowLen
+      Sawing(66) = Visibility.Collapsed                             ' CornSlowPerc
+      Sawing(67) = Visibility.Collapsed                             ' LiHole
+      Sawing(68) = Visibility.Collapsed                             ' LiHoleRad
+      Sawing(69) = Visibility.Collapsed                             ' LpTurns
+      Sawing(70) = Visibility.Collapsed                             ' HpTurns
+      Sawing(71) = Visibility.Collapsed                             ' ThicknessFeed
+      Sawing(102) = Visibility.Collapsed                            ' Expander LeadIn
+      Sawing(103) = Visibility.Collapsed                            ' Expander LeadOut
 
       ' Parametri Sawroughing
       Sawroughing(0) = Visibility.Visible                           ' Invert
@@ -379,6 +479,30 @@ Class OmagOFFICETMDbParamVisibility
       Sawroughing(47) = Visibility.Collapsed                        ' OverLapStr
       Sawroughing(48) = Visibility.Collapsed                        ' OffsetStr
       Sawroughing(49) = Visibility.Collapsed                        ' SubType
+      Sawroughing(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
+      Sawroughing(51) = Visibility.Collapsed                       ' AxRotRef
+      Sawroughing(52) = Visibility.Collapsed                       ' BlockedAxesRef
+      Sawroughing(53) = Visibility.Collapsed                       ' FaceUseType
+      Sawroughing(54) = Visibility.Collapsed                       ' InvertToolDir
+      Sawroughing(55) = Visibility.Collapsed                       ' StepBack
+      Sawroughing(56) = Visibility.Collapsed                       ' StepSideAngBack
+      Sawroughing(57) = Visibility.Collapsed                       ' BackFeed
+      Sawroughing(58) = Visibility.Collapsed                       ' StepSideAng
+      Sawroughing(59) = Visibility.Collapsed                       ' ForwardAngle
+      Sawroughing(60) = Visibility.Collapsed                       ' Probing
+      Sawroughing(61) = Visibility.Collapsed                       ' ProbingMinDist
+      Sawroughing(62) = Visibility.Collapsed                       ' ProbingMaxDist
+      Sawroughing(63) = Visibility.Collapsed                       ' ExtCornType
+      Sawroughing(64) = Visibility.Collapsed                       ' IntCornType
+      Sawroughing(65) = Visibility.Collapsed                       ' CornSlowLen
+      Sawroughing(66) = Visibility.Collapsed                       ' CornSlowPerc
+      Sawroughing(67) = Visibility.Collapsed                       ' LiHole
+      Sawroughing(68) = Visibility.Collapsed                       ' LiHoleRad
+      Sawroughing(69) = Visibility.Collapsed                       ' LpTurns
+      Sawroughing(70) = Visibility.Collapsed                       ' HpTurns
+      Sawroughing(71) = Visibility.Collapsed                       ' ThicknessFeed
+      Sawroughing(102) = Visibility.Collapsed                      ' Expander LeadIn
+      Sawroughing(103) = Visibility.Collapsed                      ' Expander LeadOut
 
       ' Parametri Sawfinishing
       Sawfinishing(0) = Visibility.Visible                          ' Invert
@@ -431,6 +555,106 @@ Class OmagOFFICETMDbParamVisibility
       Sawfinishing(47) = Visibility.Collapsed                       ' OverLapStr
       Sawfinishing(48) = Visibility.Collapsed                       ' OffsetStr
       Sawfinishing(49) = Visibility.Visible                         ' SubType
+      Sawfinishing(50) = Visibility.Collapsed                       ' SelectedSolChoiceType
+      Sawfinishing(51) = Visibility.Collapsed                       ' AxRotRef
+      Sawfinishing(52) = Visibility.Collapsed                       ' BlockedAxesRef
+      Sawfinishing(53) = Visibility.Collapsed                       ' FaceUseType
+      Sawfinishing(54) = Visibility.Collapsed                       ' InvertToolDir
+      Sawfinishing(55) = Visibility.Collapsed                       ' StepBack
+      Sawfinishing(56) = Visibility.Collapsed                       ' StepSideAngBack
+      Sawfinishing(57) = Visibility.Collapsed                       ' BackFeed
+      Sawfinishing(58) = Visibility.Collapsed                       ' StepSideAng
+      Sawfinishing(59) = Visibility.Collapsed                       ' ForwardAngle
+      Sawfinishing(60) = Visibility.Collapsed                       ' Probing
+      Sawfinishing(61) = Visibility.Collapsed                       ' ProbingMinDist
+      Sawfinishing(62) = Visibility.Collapsed                       ' ProbingMaxDist
+      Sawfinishing(63) = Visibility.Collapsed                       ' ExtCornType
+      Sawfinishing(64) = Visibility.Collapsed                       ' IntCornType
+      Sawfinishing(65) = Visibility.Collapsed                       ' CornSlowLen
+      Sawfinishing(66) = Visibility.Collapsed                       ' CornSlowPerc
+      Sawfinishing(67) = Visibility.Collapsed                       ' LiHole
+      Sawfinishing(68) = Visibility.Collapsed                       ' LiHoleRad
+      Sawfinishing(69) = Visibility.Collapsed                       ' LpTurns
+      Sawfinishing(70) = Visibility.Collapsed                       ' HpTurns
+      Sawfinishing(71) = Visibility.Collapsed                       ' ThicknessFeed
+      Sawfinishing(102) = Visibility.Collapsed                      ' Expander LeadIn
+      Sawfinishing(103) = Visibility.Collapsed                      ' Expander LeadOut
+
+      ' Parametri Waterjetting
+      Waterjetting(0) = Visibility.Visible                               ' Invert
+      Waterjetting(1) = Visibility.Collapsed                               ' LeaveTab
+      Waterjetting(2) = Visibility.Visible                               ' WorkSide
+      Waterjetting(3) = Visibility.Collapsed                             ' HeadSide
+      Waterjetting(4) = Visibility.Visible                               ' LeadInType
+      Waterjetting(5) = Visibility.Collapsed                             ' ExtLinkType
+      Waterjetting(6) = Visibility.Visible                               ' LeadOutType
+      Waterjetting(7) = Visibility.Collapsed                             ' CurveUse
+      Waterjetting(8) = Visibility.Collapsed                              ' StepType
+      Waterjetting(9) = Visibility.Collapsed                             ' LeadLinkType
+      Waterjetting(10) = Visibility.Collapsed                              ' Speed
+      Waterjetting(11) = Visibility.Visible                              ' Feed
+      Waterjetting(12) = Visibility.Collapsed                              ' StartFeed
+      Waterjetting(13) = Visibility.Collapsed                              ' EndFeed
+      Waterjetting(14) = Visibility.Visible                              ' TipFeed
+      Waterjetting(15) = Visibility.Visible                              ' OffSr
+      Waterjetting(16) = Visibility.Collapsed                             ' OffSl
+      Waterjetting(17) = Visibility.Collapsed                              ' SideAngle
+      Waterjetting(18) = Visibility.Collapsed                            ' Approx
+      Waterjetting(19) = Visibility.Collapsed                              ' StartPos
+      Waterjetting(20) = Visibility.Collapsed                            ' StartSlowLen
+      Waterjetting(21) = Visibility.Collapsed                            ' EndSlowLen
+      Waterjetting(22) = Visibility.Collapsed                            ' ThroughAddlen
+      Waterjetting(23) = Visibility.Collapsed                              ' StepPar
+      Waterjetting(24) = Visibility.Collapsed                            ' ReturnPos
+      Waterjetting(25) = Visibility.Collapsed                              ' TabLen
+      Waterjetting(26) = Visibility.Collapsed                              ' TabDist
+      Waterjetting(27) = Visibility.Collapsed                              ' TabHeight
+      Waterjetting(28) = Visibility.Collapsed                              ' TabAngle
+      Waterjetting(29) = Visibility.Visible                              ' LiTang
+      Waterjetting(30) = Visibility.Visible                              ' LiPerp
+      Waterjetting(31) = Visibility.Collapsed                              ' LiElev
+      Waterjetting(32) = Visibility.Collapsed                              ' LiCompLen
+      Waterjetting(33) = Visibility.Visible                              ' LoTang
+      Waterjetting(34) = Visibility.Visible                              ' LoPerp
+      Waterjetting(35) = Visibility.Collapsed                              ' LoElev
+      Waterjetting(36) = Visibility.Collapsed                              ' LoCompLen
+      Waterjetting(37) = Visibility.Collapsed                              ' StartAddLen
+      Waterjetting(38) = Visibility.Collapsed                              ' EndAddLen
+      Waterjetting(39) = Visibility.Collapsed                            ' StepExtArc
+      Waterjetting(40) = Visibility.Collapsed                            ' StepIntArc
+      Waterjetting(41) = Visibility.Collapsed                            ' SideStep
+      Waterjetting(42) = Visibility.Collapsed                            ' VertFeed
+      Waterjetting(43) = Visibility.Visible                              ' NamePar
+      Waterjetting(44) = Visibility.Visible                              ' Tool
+      Waterjetting(45) = Visibility.Collapsed                              ' DepthStr
+      Waterjetting(46) = Visibility.Visible                              ' UserNotes
+      Waterjetting(47) = Visibility.Collapsed                              ' OverLapStr
+      Waterjetting(48) = Visibility.Collapsed                            ' OffsetStr
+      Waterjetting(49) = Visibility.Collapsed                            ' SubType
+      Waterjetting(50) = Visibility.Collapsed                            ' SelectedSolChoiceType
+      Waterjetting(51) = Visibility.Collapsed                            ' AxRotRef
+      Waterjetting(52) = Visibility.Collapsed                            ' BlockedAxesRef
+      Waterjetting(53) = Visibility.Collapsed                            ' FaceUseType
+      Waterjetting(54) = Visibility.Collapsed                            ' InvertToolDir
+      Waterjetting(55) = Visibility.Collapsed                            ' StepBack
+      Waterjetting(56) = Visibility.Collapsed                            ' StepSideAngBack
+      Waterjetting(57) = Visibility.Collapsed                            ' BackFeed
+      Waterjetting(58) = Visibility.Collapsed                            ' StepSideAng
+      Waterjetting(59) = Visibility.Visible                              ' ForwardAngle
+      Waterjetting(60) = Visibility.Visible                              ' Probing
+      Waterjetting(61) = Visibility.Visible                              ' ProbingMinDist
+      Waterjetting(62) = Visibility.Visible                              ' ProbingMaxDist
+      Waterjetting(63) = Visibility.Visible                              ' ExtCornType
+      Waterjetting(64) = Visibility.Visible                              ' IntCornType
+      Waterjetting(65) = Visibility.Visible                              ' CornSlowLen
+      Waterjetting(66) = Visibility.Visible                              ' CornSlowPerc
+      Waterjetting(67) = Visibility.Visible                              ' LiHole
+      Waterjetting(68) = Visibility.Visible                              ' LiHoleRad
+      Waterjetting(69) = Visibility.Visible                              ' LpTurns
+      Waterjetting(70) = Visibility.Visible                              ' HpTurns
+      Waterjetting(71) = Visibility.Visible                              ' ThicknessFeed
+      Waterjetting(102) = Visibility.Collapsed                           ' Expander LeadIn
+      Waterjetting(103) = Visibility.Collapsed                           ' Expander LeadOut
 
    End Sub