diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index 95d532a..70e645f 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -386,8 +386,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2606, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2606, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2607, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2607, 1, IniFile.m_nKeyOptions)
       ' Leggo e imposto livello utilizzatore
       IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Imposto abilitazione lavorazioni avanzate
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 4413907..274ea94 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.6.6.4")>
-<Assembly: AssemblyFileVersion("2.6.6.4")>
+<Assembly: AssemblyVersion("2.6.7.1")>
+<Assembly: AssemblyFileVersion("2.6.7.1")>
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml
index f98dac0..e04a4e8 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml
@@ -172,7 +172,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml
index f97968b..e03fb7a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/ChiselingParameterExpanderV.xaml
@@ -161,7 +161,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml
index a764ed4..49da621 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/FiveAxisMachinigParameterExpanderV.xaml
@@ -150,7 +150,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml
index 1acf871..3887c37 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml
@@ -150,7 +150,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml
index a7a28f9..1669b2a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml
@@ -168,7 +168,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml
index 40c3e6f..1503913 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml
@@ -177,7 +177,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml
index 5ea2fe6..33a1d09 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneDrillingParameterExpanderV.xaml
@@ -149,7 +149,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml
index 3f725b8..8e75e73 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneMillingParameterExpanderV.xaml
@@ -153,7 +153,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml
index 20d5ba7..83db9fc 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawFinishingParameterExpanderV.xaml
@@ -147,7 +147,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml
index 3e009c1..4f291b0 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawRoughingParameterExpanderV.xaml
@@ -145,7 +145,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml
index 10e4510..3bf3a57 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml
@@ -153,7 +153,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml
index 5ff067b..217969a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfFinishingParameterExpanderV.xaml
@@ -160,7 +160,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml
index 8a14e7d..0a0f47c 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/SurfRoughingParameterExpanderV.xaml
@@ -170,7 +170,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml
index 904aa6a..46ec7e1 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WaterjettingParameterExpanderV.xaml
@@ -135,7 +135,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml
index 3eeb6d7..a6b03c9 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodDrillingParameterExpanderV.xaml
@@ -154,7 +154,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml
index 399e8e4..6f9ba63 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodMillingParameterExpanderV.xaml
@@ -172,7 +172,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml
index 17b47cd..fa5d879 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/WoodSawingParameterExpanderV.xaml
@@ -162,7 +162,7 @@
                                              IsReadOnly="False"/>
                                  </TabItem>
                                  <TabItem Header="CHECKBOX">
-                                    <CheckBox IsChecked="{Binding Value}"/>
+                                    <CheckBox IsChecked="{Binding Value, UpdateSourceTrigger=PropertyChanged}"/>
                                  </TabItem>
                               </TabControl>
                               <Button Command="{Binding RemoveItemNoteCommand}"
diff --git a/Special-Doors/TableUtility.vb b/Special-Doors/TableUtility.vb
index 11f3d43..4d88f3a 100644
--- a/Special-Doors/TableUtility.vb
+++ b/Special-Doors/TableUtility.vb
@@ -428,18 +428,19 @@ Module TableUtility
                Dim CurrMachining As MTableMachiningGridBoxItem = SelectedTable.ActiveMachinesList(MachineIndex).MachiningList(MachiningIndex)
                If CurrMachining.GroupId <> CurrGroupId And Not String.IsNullOrWhiteSpace(CurrMachining.PropertyPar) Then
                   Dim CurrentLine As String = "   { MachId = '" & SelectedTable.ActiveMachinesList(MachineIndex).MachId & "', Group = " & (CurrMachining.GroupId * 100).ToString &
-                                              ", Property = " & CurrMachining.PropertyPar & " }"
-                  If CurrMachining.GroupId <> LastGroupId Then
-                     CurrentLine &= " ,"
-                  End If
+                                              ", Property = " & CurrMachining.PropertyPar & " } ,"
+                  'If CurrMachining.GroupId <> LastGroupId Then
+                  '   CurrentLine &= " ,"
+                  'End If
                   NewTableFileContent.Add(CurrentLine)
                   CurrGroupId = CurrMachining.GroupId
-               ElseIf CurrMachining.GroupId <> CurrGroupId And CurrMachining.GroupId = LastGroupId Then
-                  NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c)
+                  'ElseIf MachineIndex = SelectedTable.ActiveMachinesList.Count - 1 AndAlso CurrMachining.GroupId <> CurrGroupId And CurrMachining.GroupId = LastGroupId Then
+                  '   NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c)
                End If
             Next
          End If
       Next
+      NewTableFileContent(NewTableFileContent.Count - 1) = NewTableFileContent(NewTableFileContent.Count - 1).Trim(","c)
    End Sub
 
    Private Sub ReorderMachiningIndex(SelectedTable As MTableListBoxItem)