diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb
index d282287..cf5b435 100644
--- a/Constants/ConstIni.vb
+++ b/Constants/ConstIni.vb
@@ -112,6 +112,7 @@ Module ConstIni
    Public Const K_BTLAUXDIR As String = "BtlAuxDir"
    Public Const K_3MFFLAG As String = "3mfFlag"
    Public Const K_ADVFLAG As String = "AdvFlag"
+   Public Const K_ADVTOLER As String = "AdvToler"
 
    Public Const S_EXPORT As String = "Export"
    Public Const K_DXFFLAG As String = "DxfFlag"
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 1aca076..45afb08 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.7.1.2")>
-<Assembly: AssemblyFileVersion("2.7.1.2")>
+<Assembly: AssemblyVersion("2.7.1.3")>
+<Assembly: AssemblyFileVersion("2.7.1.3")>
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb
index 45bdb07..25a914d 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/DispositionUtility.vb
@@ -775,6 +775,9 @@ Public NotInheritable Class DispositionUtility
       m_nUsedHookId = nNearestHookId
       ' Segno hook come utilizzato
       SetHookUsed(m_nUsedHookId, nMoveId, True)
+      Dim sLinkName As String = ""
+      EgtGetName( EgtGetParent( m_nUsedHookId), sLinkName)
+      EgtSetFixtureLink( nMoveId, sLinkName)
       Return True
    End Function
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb
index a9de661..7c8ab7a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/DispositionParameterExpander/FixtureParameters/FixtureParametersVM.vb
@@ -140,6 +140,7 @@ Public Class FixtureParametersVM
                If Not PositionFixtureOnNearestHook(nAddedFixtureId) Then
                   ' non ci sono punti liberi, quindi rimuovo la ventosa e segnalo
                   EgtRemoveFixture(nAddedFixtureId)
+                  EgtSetFixtureLink( nAddedFixtureId, "")
                   MessageBox.Show("No free hook point!", "ERROR")
                   Return
                End If
@@ -297,6 +298,7 @@ Public Class FixtureParametersVM
                Else
                   DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
                End If
+               EgtSetFixtureLink( nFixtureId, "")
                Return True
             Else
                EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
@@ -320,6 +322,7 @@ Public Class FixtureParametersVM
                   Else
                      DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
                   End If
+                  EgtSetFixtureLink( nFixtureId, "")
                   Return True
                Else
                   EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
@@ -348,6 +351,7 @@ Public Class FixtureParametersVM
                      Else
                         DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
                      End If
+                     EgtSetFixtureLink( nFixtureId, sBarName)
                      Return True
                   Else
                      EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
@@ -373,6 +377,7 @@ Public Class FixtureParametersVM
                            Else
                               DispositionUtility.AddHookUsed( nCurrHookId, nFixtureId)
                            End If
+                           EgtSetFixtureLink( nFixtureId, sCharName)
                            Return True
                         Else
                            EgtStartPoint(nFixtHookId, GDB_ID.ROOT, ptFixtHook)
diff --git a/OptionsWindow/OptionModule.vb b/OptionsWindow/OptionModule.vb
index ecf640c..a270b20 100644
--- a/OptionsWindow/OptionModule.vb
+++ b/OptionsWindow/OptionModule.vb
@@ -25,6 +25,7 @@ Friend Module OptionModule
    Friend m_dStlScaleFactor As Double
    Friend m_dOffScaleFactor As Double
    Friend m_dImgScaleFactor As Double
+   Friend m_dAdvImpTolerance As Double
 
    ' Parametri per export
    Friend m_nExportDxfFlag As Integer
@@ -120,6 +121,7 @@ Friend Module OptionModule
       m_dStlScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_STLSCALE, 1)
       m_dOffScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_OFFSCALE, 1)
       m_dImgScaleFactor = GetPrivateProfileDouble(S_IMPORT, K_IMGSCALE, 1)
+      m_dAdvImpTolerance = GetPrivateProfileDouble(S_IMPORT, K_ADVTOLER, 0.05)
       ' Inizializzo variabili per export
       m_nExportDxfFlag = GetPrivateProfileInt(S_EXPORT, K_DXFFLAG, EEX_FL.COMP_LAYER)
       m_nImgWidth = GetPrivateProfileInt(S_EXPORT, K_IMGWIDTH, 400)
diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml
index e658a17..988005b 100644
--- a/OptionsWindow/OptionWindowV.xaml
+++ b/OptionsWindow/OptionWindowV.xaml
@@ -136,6 +136,9 @@
       </TabItem>
       <TabItem Header="{Binding ImportMsg}">
          <StackPanel Margin="5,5,5,0">
+            <GroupBox Grid.Column="1" Grid.RowSpan="2"
+                      Header=""
+                      Margin="0,0,0,5">
             <Grid Margin="0,5,0,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
@@ -151,7 +154,7 @@
                </Grid.RowDefinitions>
                <TextBlock Grid.Row="0" Grid.Column="1" 
                           VerticalAlignment="Center" HorizontalAlignment="Center"  
-                          Text="{Binding UnitScaleMsg}" />
+                          Text="{Binding UnitScaleMsg}"/>
                <TextBlock Grid.Row="0" Grid.Column="2" 
                           VerticalAlignment="Center" HorizontalAlignment="Center"  
                           Text="{Binding FactorScaleMsg}"/>
@@ -160,12 +163,12 @@
                <ComboBox Grid.Row="1" Grid.Column="1"
                          ItemsSource="{Binding ScaleDXFList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedDXFScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
-                         Margin="10,0,0,5"/>
+                         Margin="10,5,0,5"/>
                <TextBox Grid.Row="1" Grid.Column="2"
                         Text="{Binding DxfScaleFactor}" Height="25"
                         IsEnabled="{Binding DXFScaleEnable, UpdateSourceTrigger=LostFocus}"
                         VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
+                        Margin="10,5,0,5"/>
                <TextBlock Grid.Row="2" Grid.Column="0"
                           Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
                <ComboBox Grid.Row="2" Grid.Column="1"
@@ -200,6 +203,14 @@
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,5"/>
             </Grid>
+            </GroupBox>
+            <UniformGrid Grid.ColumnSpan="2" Columns="2"
+                         Margin="0,5,0,5">
+               <TextBlock Text="{Binding AdvImpToleranceMsg}" VerticalAlignment="Center"/>
+               <TextBox Text="{Binding AdvImpTolerance}" Height="25"
+                        VerticalContentAlignment="Center"
+                        Margin="10,0,0,0"/>
+            </UniformGrid>
          </StackPanel>
       </TabItem>
       <TabItem Header="{Binding ExportMsg}">
diff --git a/OptionsWindow/OptionWindowVM.vb b/OptionsWindow/OptionWindowVM.vb
index 6b65dce..7d5a232 100644
--- a/OptionsWindow/OptionWindowVM.vb
+++ b/OptionsWindow/OptionWindowVM.vb
@@ -383,6 +383,20 @@ Public Class OptionWindowVM
       End Set
    End Property
 
+   Public Property AdvImpTolerance As String
+      Get
+         Return LenToString(OptionModule.m_dAdvImpTolerance, 5)
+      End Get
+      Set(value As String)
+         Dim dVal As Double = 0
+         If StringToLen(value, dVal) AndAlso dVal > 0 Then
+            OptionModule.m_dAdvImpTolerance = dVal
+            Map.refProjectVM.GetController.SetAdvImpTolerance(OptionModule.m_dAdvImpTolerance)
+            WritePrivateProfileString(S_IMPORT, K_ADVTOLER, DoubleToString(OptionModule.m_dAdvImpTolerance, 5))
+         End If
+      End Set
+   End Property
+
    Public Property ImageWidth As String
       Get
          Return OptionModule.m_nImgWidth.ToString()
@@ -866,33 +880,37 @@ Public Class OptionWindowVM
 
    Public ReadOnly Property ImportMsg As String
       Get
-         Return EgtMsg(MSG_OPTIONPAGE + 19)
+         Return EgtMsg(6519)    ' Import
       End Get
    End Property
    Public ReadOnly Property DxfScaleFactorMsg As String
       Get
-         Return EgtMsg(MSG_OPTIONPAGE + 20)
+         Return EgtMsg(6520)    ' DXF
       End Get
    End Property
    Public ReadOnly Property StlScaleFactorMsg As String
       Get
-         Return EgtMsg(MSG_OPTIONPAGE + 21)
+         Return EgtMsg(6521)    ' STL
       End Get
    End Property
    Public ReadOnly Property OffScaleFactorMsg As String
       Get
-         Return "OFF"
+         Return EgtMsg(6561)    ' OFF
       End Get
    End Property
    Public ReadOnly Property ImageScaleFactorMsg As String
       Get
-         Return EgtMsg(MSG_OPTIONPAGE + 22)
+         Return EgtMsg(6522)    ' Immagini
+      End Get
+   End Property
+   Public ReadOnly Property AdvImpToleranceMsg As String
+      Get
+         Return EgtMsg(6562)    ' Tolleranza di importazione
       End Get
    End Property
-
    Public ReadOnly Property ExportMsg As String
       Get
-         Return EgtMsg(MSG_OPTIONPAGE + 23)
+         Return EgtMsg(6523)     ' Export
       End Get
    End Property
    Public ReadOnly Property UnitScaleMsg As String
diff --git a/Project/ProjectVM.vb b/Project/ProjectVM.vb
index 42fd4e6..d9964c3 100644
--- a/Project/ProjectVM.vb
+++ b/Project/ProjectVM.vb
@@ -348,6 +348,7 @@ Public Class ProjectVM
          End If
       End If
       m_Controller.SetSurfTmTolerance(OptionModule.m_dGeometryTolerance)
+      m_Controller.SetAdvImpTolerance(OptionModule.m_dAdvImpTolerance)
       m_Controller.SetUseCustomColors(True, S_SCENE, K_CUSTOMCOLORS)
       ' imposto unità di misura per interfaccia utente
       IniFile.m_bMmUnits = (GetPrivateProfileInt(S_SCENE, K_MMUNITS, 1) <> 0)