diff --git a/Constants/ConstDoors.vb b/Constants/ConstDoors.vb
index 71f5562..bf95e22 100644
--- a/Constants/ConstDoors.vb
+++ b/Constants/ConstDoors.vb
@@ -1,6 +1,13 @@
-Module ConstDoors
+
+Module ConstDoors
 
-   Public Const S_OPERATIONS As String = "Operations"
+   ' File contenente la lista dei nomi di geometria ammessi
+   Public Const GEONAMELIST_FILE As String = "GeometryNameList.ini"
    Public Const S_GEOMETRYNAMES As String = "GeometryNames"
 
+   ' File contenente la lista delle operazioni ammesse
+   Public Const OPERATIONLIST_FILE As String = "OperationList.ini"
+   Public Const S_OPERATIONS As String = "Operations"
+
+
 End Module
diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index 37f2f54..a0e22e5 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -95,6 +95,7 @@ Module ConstIni
    Public Const K_DDFDIR As String = "DdfDir"
    Public Const K_DDFDEFAULTDIR As String = "DdfDefaultDir"
    Public Const K_DDFMACHEXEC As String = "DdfMachExec"
+   Public Const K_TABLESDIR As String = "TablesDir"
 
    Public Const S_GUNSTOCK As String = "GunStock"
    Public Const K_MODENABLE As String = "ModEnable"
@@ -115,9 +116,6 @@ Module ConstIni
    Public Const K_SELGEOMSAWFINISHING As String = "SelGeomSawFinishing"
    Public Const K_MACHININGGROUP As String = "MachiningGroup"
 
-   Public Const S_TABLE As String = "Table"
-   Public Const K_TABLESDIR As String = "TablesDir"
-
    Public Const S_SIMUL As String = "Simul"
    Public Const K_SLIDERX As String = "SliderX"
    Public Const K_SLIDERVAL As String = "SliderVal"
diff --git a/MTableDb/MTableDbViewModel.vb b/MTableDb/MTableDbViewModel.vb
index 6a39eae..e2a960d 100644
--- a/MTableDb/MTableDbViewModel.vb
+++ b/MTableDb/MTableDbViewModel.vb
@@ -64,7 +64,7 @@ Namespace EgtCAM5
 
       Private Sub SearchTables()
          ' Leggo dal file ini il direttorio per le Table
-         If GetPrivateProfileString(S_TABLE, K_TABLESDIR, "", IniFile.m_sTablesRoot) = 0 _
+         If GetPrivateProfileString(S_DOORS, K_TABLESDIR, "", IniFile.m_sTablesRoot) = 0 _
             Or Not My.Computer.FileSystem.DirectoryExists(IniFile.m_sTablesRoot) Then
             ' Se non lo trovo mando messaggio di errore e chiudo la finestra
             MessageBox.Show("ERROR IN LOADING TABLES", "Tables dir not found.")
@@ -75,10 +75,7 @@ Namespace EgtCAM5
                m_TablesList.Add(New MTableListBoxItem(Path.GetFileNameWithoutExtension(Table), Table))
                Dim sNameIndex As String = Regex.Match(Path.GetFileNameWithoutExtension(Table), "MTable_(\d+)").Groups(1).Value
                Dim nNameIndex As Integer = 0
-               If String.IsNullOrEmpty(sNameIndex) Then
-                  ' il suo valore di default è 1 quindi lo imposto a questo valore
-                  nNameIndex = 0
-               Else
+               If Not String.IsNullOrEmpty(sNameIndex) Then
                   Integer.TryParse(sNameIndex, nNameIndex)
                End If
                If nNameIndex > MTableListBoxItem.NewMTableIndex Then
diff --git a/MTableDb/MTableListBox.vb b/MTableDb/MTableListBox.vb
index f0d0a0b..4206d70 100644
--- a/MTableDb/MTableListBox.vb
+++ b/MTableDb/MTableListBox.vb
@@ -79,7 +79,7 @@ Public Class MTableListBoxItem
    Private Const MMACHINEDATA As String = ".MMachineData"
    Private Const MACHNAME As String = "MachName"
    Private Const NCGENERATE As String = "NcGenerate"
-   Private Const MAKERAW As String = "Makeraw"
+   Private Const MAKERAW As String = "MakeRaw"
    Private Const MTABLE As String = ".MTable"
    Private Const NAME As String = "Name"
    Private Const ONCONST As String = "On"
@@ -530,7 +530,7 @@ Public Class MTableAssociationGridBoxItem
       OnPar = bOn
       ' Inizializzo la lista dei nomi solo la prima volta
       If IsNothing(m_NamesList) Then
-         Dim NameFilePath As String = IniFile.m_sTablesRoot & "/GeometryNamesList.ini"
+         Dim NameFilePath As String = IniFile.m_sTablesRoot & "/" & GEONAMELIST_FILE
          Dim TempNameList As New List(Of String)
          Dim Index As Integer = 1
          Dim sRaedName As String = String.Empty
@@ -558,7 +558,7 @@ Public Class MTableAssociationGridBoxItem
          ' aggiungo elemento stringa vuota per dare la possibilità di non selezionarne nessuna operazione
          TempOperList.Add(String.Empty)
          ' aggiungo tutte le altre
-         Dim OperationFilePath As String = IniFile.m_sTablesRoot & "/OperationsList.ini"
+         Dim OperationFilePath As String = IniFile.m_sTablesRoot & "/" & OPERATIONLIST_FILE
          Dim Index As Integer = 1
          Dim sRaedOperation As String = String.Empty
          While EgtUILib.GetPrivateProfileString(S_OPERATIONS, Index.ToString, "", sRaedOperation, OperationFilePath) > 0
diff --git a/MTableDb/TableUtility.vb b/MTableDb/TableUtility.vb
index c1304e5..6e5a32d 100644
--- a/MTableDb/TableUtility.vb
+++ b/MTableDb/TableUtility.vb
@@ -14,11 +14,8 @@ Module TableUtility
       Dim bMTable As Boolean = False
       For LineIndex As Integer = 0 To FileContent.Count - 1
          Dim sCurrLine As String = FileContent(LineIndex)
-         If sCurrLine.Contains(DATETIME) Then
-            sCurrLine = sCurrLine.Replace(DATETIME, System.DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss"))
-         ElseIf FileContent(LineIndex).Contains(TABLENAME) Then
-            sCurrLine = sCurrLine.Replace(TABLENAME, Path.GetFileNameWithoutExtension(sTableNamePath))
-         End If
+         sCurrLine = sCurrLine.Replace(DATETIME, System.DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss"))
+         sCurrLine = sCurrLine.Replace(TABLENAME, Path.GetFileNameWithoutExtension(sTableNamePath))
 
          If sCurrLine.Contains(MMACHINEDATA) Then
             bMMachineData = True
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index adb9bf3..dad013f 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.6.22.7")> 
-<Assembly: AssemblyFileVersion("1.6.22.7")> 
+<Assembly: AssemblyVersion("1.6.22.8")> 
+<Assembly: AssemblyFileVersion("1.6.22.8")> 
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
index 7e180a5..c5cf77c 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderView.xaml
@@ -73,7 +73,7 @@
 
             <UniformGrid Rows="1">
                <Button Content="{Binding NewMachiningBtnContent}" Command="{Binding NewMachiningCommand}"  Height="30"/>
-               <Button Content="{Binding NewPositioningBtnContent}" IsEnabled="False" Command="{Binding NewPositioningCommand}"  Height="30"/>
+               <Button Content="{Binding NewPositioningBtnContent}" Command="{Binding NewPositioningCommand}"  Height="30"/>
                <Button Content="{Binding CancelOperationBtnContent}" Command="{Binding CancelOperationCommand}"  Height="30"/>
             </UniformGrid>
             <ListBox IsSynchronizedWithCurrentItem="True" ItemsSource="{Binding OperationList}" SelectedItem="{Binding SelectedOperation}"
@@ -93,10 +93,12 @@
                   <DataTemplate>
                      <Grid>
                         <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
                            <ColumnDefinition Width="Auto"/>
                            <ColumnDefinition Width="1*"/>
                            <ColumnDefinition Width="1*"/>
                         </Grid.ColumnDefinitions>
+                        <CheckBox IsChecked="{Binding Status}" Margin="0,0,5,0"/>
                         <Image Source="{Binding Image}" Height="15" Margin="0,0,5,0"/>
                         <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="0,0,5,0"/>
                         <TextBlock Grid.Column="2" Text="{Binding Info}"/>
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
index c7756a5..7634a3d 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationExpanderViewModel.vb
@@ -658,7 +658,10 @@ Namespace EgtCAM5
       ''' Execute the Point.  This method is invoked by the PointCommand.
       ''' </summary>
       Public Sub NewPositioning(ByVal param As Object)
-
+         Dim nPhase As Integer = EgtAddPhase()
+         Dim nDispId As Integer = EgtGetPhaseDisposition(nPhase)
+         ' Ricarico la lista delle operazioni
+         Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST, nDispId)
       End Sub
 
 #End Region ' NewPositioningCommand
@@ -681,7 +684,7 @@ Namespace EgtCAM5
       ''' Execute the Point.  This method is invoked by the PointCommand.
       ''' </summary>
       Public Sub CancelOperation(ByVal param As Object)
-         ' se viene premuto il tasto Esc
+         ' Se viene premuto il tasto Esc
          If DirectCast(param, String) = "Escape" Then
             If m_NewMachining Then
                NewMachining = False
@@ -689,20 +692,30 @@ Namespace EgtCAM5
             End If
             Return
          End If
-         ' in tutti gli altri casi
+         ' Se sto inserendo una nuova lavorazione
          If m_NewMachining Then
             NewMachining = False
             ListIsExpanded = True
+         ' altrimenti sto cancellandone una vecchia
          Else
             If Not IsNothing(SelectedOperation) Then
-               ' Salvo indice operazione selezionata
+               ' Salvo indice operazione precedente a selezionata
                Dim nPrevOperId As Integer = EgtGetPrevOperation(SelectedOperation.Id)
-               ' Smarco e deseleziono la geometria selezionata
-               EgtResetMark(m_LastMarkedOperationId)
-               EgtDeselectAll()
-               EgtDraw()
-               ' Rimuovo l'operazione selezionata
-               EgtRemoveOperation(SelectedOperation.Id)
+               If SelectedOperation.Type = MCH_OY.DISP Then
+                  ' Posso cancellare solo l'ultima disposizione
+                  If EgtGetOperationPhase(SelectedOperation.Id) = EgtGetPhaseCount() Then
+                     EgtRemoveLastPhase()
+                  Else
+                     Return
+                  End If
+               Else
+                  ' Smarco e deseleziono la geometria selezionata
+                  EgtResetMark(m_LastMarkedOperationId)
+                  EgtDeselectAll()
+                  EgtDraw()
+                  ' Rimuovo l'operazione selezionata
+                  EgtRemoveOperation(SelectedOperation.Id)
+               End If
                ' Ricarico la lista delle operazioni
                Application.Msn.NotifyColleagues(Application.LOADOPERATIONLIST, nPrevOperId)
             End If
@@ -744,7 +757,7 @@ Namespace EgtCAM5
       Public ReadOnly Property MoveUpCommand As ICommand
          Get
             If m_cmdMoveUp Is Nothing Then
-               m_cmdMoveUp = New RelayCommand(AddressOf MoveUp, AddressOf CanMoveUp)
+               m_cmdMoveUp = New RelayCommand(AddressOf MoveUp)
             End If
             Return m_cmdMoveUp
          End Get
@@ -760,15 +773,13 @@ Namespace EgtCAM5
             If SelectedOperation.Type = MCH_OY.DISP Then Return
             ' Trovo indice dell'entità selezionata 
             Dim SelectedIndex As Integer = OperationList.IndexOf(SelectedOperation)
-            ' Verifico che l'indice sia >= 2 perchè il primo è e deve essere una disposizione
-            If SelectedIndex < 2 Then
-               Return
-            End If
+            ' Posso spostare solo se la precedente non è una disposizione (per non cambiare fase)
+            If OperationList(SelectedIndex - 1).Type = MCH_OY.DISP Then Return
             ' Recupero Id entità selezionata e precedente a quella selezionata
             Dim SelectedId As Integer = OperationList(SelectedIndex).Id
             Dim PreviousId As Integer = OperationList(SelectedIndex - 1).Id
             ' Sposto l'operazione selezionata nell'ambiente Egt
-            If EgtRelocate(SelectedOperation.Id, PreviousId, GDB_POS.BEFORE) Then
+            If EgtRelocate(SelectedId, PreviousId, GDB_POS.BEFORE) Then
                ' Sposto l'operazione selezionata nella grafica
                OperationList.Move(SelectedIndex, SelectedIndex - 1)
                ' Ricalcolo la lavorazione selezionata e la precedente
@@ -781,13 +792,6 @@ Namespace EgtCAM5
          End If
       End Sub
 
-      ''' <summary>
-      ''' Returns always true.
-      ''' </summary>
-      Private Function CanMoveUp(ByVal param As Object) As Boolean
-         Return True
-      End Function
-
 #End Region ' MoveUpCommand
 
 #Region "MoveDownCommand"
@@ -798,7 +802,7 @@ Namespace EgtCAM5
       Public ReadOnly Property MoveDownCommand As ICommand
          Get
             If m_cmdMoveDown Is Nothing Then
-               m_cmdMoveDown = New RelayCommand(AddressOf MoveDown, AddressOf CanMoveDown)
+               m_cmdMoveDown = New RelayCommand(AddressOf MoveDown)
             End If
             Return m_cmdMoveDown
          End Get
@@ -815,14 +819,14 @@ Namespace EgtCAM5
             ' Trovo indice dell'entità selezionata 
             Dim SelectedIndex As Integer = OperationList.IndexOf(SelectedOperation)
             ' Verifico che l'indice sia < della lunghezza della lista delle operazioni,altrimenti è già ultima e quindi non la posso spostare
-            If SelectedIndex > OperationList.Count - 2 Then
-               Return
-            End If
+            If SelectedIndex > OperationList.Count - 2 Then Return
+            ' Posso spostare solo se la successiva non è una disposizione (per non cambiare fase)
+            If OperationList(SelectedIndex + 1).Type = MCH_OY.DISP Then Return
             ' Recupero Id entitàselezionata e successiva a quella selezionata
             Dim SelectedId As Integer = OperationList(SelectedIndex).Id
             Dim PostId As Integer = OperationList(SelectedIndex + 1).Id
             ' Sposto l'operazione selezionata nell'ambiente Egt
-            If EgtRelocate(SelectedOperation.Id, PostId, GDB_POS.AFTER) Then
+            If EgtRelocate(SelectedId, PostId, GDB_POS.AFTER) Then
                ' Sposto l'operazione selezionata nella grafica
                OperationList.Move(SelectedIndex, SelectedIndex + 1)
                ' Ricalcolo la lavorazione selezionata e la successiva
@@ -835,13 +839,6 @@ Namespace EgtCAM5
          End If
       End Sub
 
-      ''' <summary>
-      ''' Returns always true.
-      ''' </summary>
-      Private Function CanMoveDown(ByVal param As Object) As Boolean
-         Return True
-      End Function
-
 #End Region ' MoveDownCommand
 
 #Region "UpdateCommand"
@@ -862,13 +859,19 @@ Namespace EgtCAM5
       ''' Execute the Point.  This method is invoked by the PointCommand.
       ''' </summary>
       Public Sub Update()
-         ' Ricalcolo la lavorazione per tutte le operazioni della lista, saltando le disposizioni
+         ' Recupero fase corrente
+         Dim nCurrPhase As Integer = EgtGetCurrPhase()
+         ' Ricalcolo la lavorazione per tutte le operazioni della lista
          For Each Operation In OperationList
-            If Not Operation.Type = MCH_OY.DISP Then
+            If Operation.Type = MCH_OY.DISP Then
+               EgtSetCurrPhase(EgtGetOperationPhase(Operation.Id))
+            Else
                EgtSetCurrMachining(Operation.Id)
                EgtApplyMachining(True)
             End If
          Next
+         ' Ripristino la fase inizialmente corrente
+         EgtSetCurrPhase(nCurrPhase)
          EgtDraw()
       End Sub
 
@@ -944,6 +947,7 @@ Namespace EgtCAM5
       Private Sub LoadOperationList()
          OperationList.Clear()
          Dim Id As Integer
+         Dim OpStatus As Boolean = True
          Dim OpName As String = String.Empty
          Dim OpType As Integer = 0
          Dim OpTool As String = String.Empty
@@ -955,12 +959,15 @@ Namespace EgtCAM5
             Select Case OpType
                Case MCH_OY.DRILLING, MCH_OY.SAWING, MCH_OY.MILLING, MCH_OY.POCKETING, MCH_OY.MORTISING, MCH_OY.SAWROUGHING, MCH_OY.SAWFINISHING
                   EgtSetCurrMachining(Id)
+                  OpStatus = EgtGetOperationMode(Id)
                   EgtGetMachiningParam(MCH_MP.TOOL, OpTool)
                   EgtGetMachiningParam(MCH_MP.NAME, OpMach)
                Case MCH_OY.DISP
+                  OpStatus = True
                   OpTool = String.Empty
+                  OpMach = String.Empty
             End Select
-            OperationList.Add(New OperationListBoxItem(Id, OpName, OpType, OpTool, OpMach))
+            OperationList.Add(New OperationListBoxItem(Id, OpStatus, OpName, OpType, OpTool, OpMach))
             Id = EgtGetNextOperation(Id)
          End While
       End Sub
diff --git a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
index b95e891..2052cb0 100644
--- a/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
+++ b/ProjectPage/OptionPanel/MachiningOptionPanel/OperationExpander/OperationListBox.vb
@@ -22,6 +22,24 @@ Public Class OperationListBoxItem
       End Set
    End Property
 
+   Private m_Status As Boolean
+   Public Property Status As Boolean
+      Get
+         Return m_Status
+      End Get
+      Set(value As Boolean)
+         If value <> m_Status Then
+            If m_Type = MCH_OY.NONE Or m_Type = MCH_OY.DISP Then
+               m_Status = True
+            Else
+               m_Status = value
+               EgtSetOperationMode(Id, m_Status)
+               EgtDraw()
+            End If
+         End If
+      End Set
+   End Property
+
    Private m_Name As String
    Public Property Name As String
       Get
@@ -752,8 +770,9 @@ Public Class OperationListBoxItem
       End Set
    End Property
 
-   Sub New(Id As Integer, Name As String, Type As Integer, Tool As String, Mach As String)
+   Sub New(Id As Integer, Status As Boolean, Name As String, Type As Integer, Tool As String, Mach As String)
       Me.Id = Id
+      Me.Status = Status
       Me.Name = Name
       Me.m_Type = Type
       Me.Image = ConvertTypeToImage(Type)