diff --git a/Step.Config/Config/toolManagerConfig.xml b/Step.Config/Config/toolManagerConfig.xml
index ac6973c9..c4e87e65 100644
--- a/Step.Config/Config/toolManagerConfig.xml
+++ b/Step.Config/Config/toolManagerConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <root>
   <toolManagerConfig>
+    <toolMetricType>RADIUS</toolMetricType> <!-- RADIUS/DIAMETER -->
     <familyOpt>true</familyOpt>
     <shankOpt>false</shankOpt>
     <magPositionOpt>true</magPositionOpt>
diff --git a/Step.Config/Config/toolManagerConfigValidator.xsd b/Step.Config/Config/toolManagerConfigValidator.xsd
index b9432357..305328ba 100644
--- a/Step.Config/Config/toolManagerConfigValidator.xsd
+++ b/Step.Config/Config/toolManagerConfigValidator.xsd
@@ -6,6 +6,7 @@
         <xs:element name="toolManagerConfig">
           <xs:complexType>
             <xs:all>
+              <xs:element name="toolMetricType" type="tmType" minOccurs='1' maxOccurs='1'/>
               <xs:element name="familyOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
               <xs:element name="shankOpt" type="xs:boolean" minOccurs="1" maxOccurs="1" />
               <xs:element name="magPositionOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
@@ -131,7 +132,14 @@
       </xs:all>
     </xs:complexType>
   </xs:element>
-
+  
+  
+  <xs:simpleType name="tmType" final="restriction" >
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="RADIUS" />
+      <xs:enumeration value="DIAMETER" />
+    </xs:restriction>
+  </xs:simpleType>
 
   <!-- Language Type -->
   <xs:complexType name="langType">
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index 205b73c7..cf745b78 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -402,6 +402,7 @@ namespace Step.Config
                 .Descendants("toolManagerConfig")
                 .Select(x => new ToolManagerConfigModel()
                 {
+                    ToolMetricType = x.Element("toolMetricType").Value,
                     FamilyOpt = Convert.ToBoolean(x.Element("familyOpt").Value),
                     ShankOpt = Convert.ToBoolean(x.Element("shankOpt").Value),
                     MagPosTypeOpt = Convert.ToBoolean(x.Element("magPositionOpt").Value),
diff --git a/Step.Model/ConfigModels/ToolManagerConfigModel.cs b/Step.Model/ConfigModels/ToolManagerConfigModel.cs
index a4f323cf..17b21ac4 100644
--- a/Step.Model/ConfigModels/ToolManagerConfigModel.cs
+++ b/Step.Model/ConfigModels/ToolManagerConfigModel.cs
@@ -8,6 +8,8 @@ namespace Step.Model.ConfigModels
 {
     public class ToolManagerConfigModel
     {
+        
+        public string ToolMetricType { get; set; }
         public bool FamilyOpt { get; set; }
         public bool ShankOpt { get; set; }
         public bool MagPosTypeOpt { get; set; }
diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs
index 6dffe752..5e6d62d9 100644
--- a/Step.Model/Constants.cs
+++ b/Step.Model/Constants.cs
@@ -8,6 +8,10 @@ namespace Step.Model
         public static string NOT_FOUND_ALARM_MESSAGE = "Alarm_id_{0} : Message not found";
         public static string NOT_CONFIGURATED_ALARM_MESSAGE = "Alarm_id_{0} : Message not configurated";
 
+        //Costanti Tipo metreica utensili
+        public const string RADIUS_METRIC = "RADIUS";
+        public const string DIAM_METRIC = "DIAMETER";
+
         public enum SCADA_ELEMENT_TYPE
         {
             BUTTON = 0,
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 35a2256c..e61ed734 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -1531,6 +1531,8 @@ namespace Step.NC
                     mag.AssistedToolingIsActive = magConfig.AssistedTooling;
             }
 
+            config.RadiusMetricType = (ToolManagerConfig.ToolMetricType == RADIUS_METRIC);
+
             if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO)
             {
                 // Setup options
diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml
index a2fe1f45..382c1475 100644
--- a/Step.Utils/languages/IT.xml
+++ b/Step.Utils/languages/IT.xml
@@ -267,6 +267,8 @@
   <tooling_equipment_list_category_dynamicCompensation>Compensazione Dinamica:</tooling_equipment_list_category_dynamicCompensation>
   <tooling_equipment_list_category_tcp>Tabella TCP:</tooling_equipment_list_category_tcp>
   <tooling_equipment_list_category_selfAdaptive>Percorso autoadattativo:</tooling_equipment_list_category_selfAdaptive>
+  <tooling_families_list_category_gamma>Gamma Inverter:</tooling_families_list_category_gamma> 
+  <tooling_families_list_category_magazine>Magazzino:</tooling_families_list_category_magazine> 
 
   
   <!-- Tool Manager - Tool Params -->
@@ -343,11 +345,11 @@
   <tooling_family_param_tcpTable>Id Tabella-Tcp associata</tooling_family_param_tcpTable>
   <tooling_family_param_maxSpeed>Velocità massima</tooling_family_param_maxSpeed>
   <tooling_family_param_maxLoad>Carico Massimo</tooling_family_param_maxLoad>  
-  <tooling_family_param_minLoadPctAutoload>Pct. Autoload Carico Minimo</tooling_family_param_minLoadPctAutoload>
-  <tooling_family_param_maxLoadPctAutoload>Pct. AutoLoad Carico Massimo</tooling_family_param_maxLoadPctAutoload>
-  <tooling_family_param_dynamicCompensation>Compensazione Dinamica</tooling_family_param_dynamicCompensation>
-  <tooling_family_param_minLoadDynamicCompensation>Compensazione dinamica Carico Minimo</tooling_family_param_minLoadDynamicCompensation>
-  <tooling_family_param_maxLoadDynamicCompensation>Compensazione dinamica Carico Massimo</tooling_family_param_maxLoadDynamicCompensation>
+  <tooling_family_param_minLoadPctAutoload>Carico Minimo</tooling_family_param_minLoadPctAutoload>
+  <tooling_family_param_maxLoadPctAutoload>Carico Massimo</tooling_family_param_maxLoadPctAutoload>
+  <tooling_family_param_dynamicCompensation>Coefficiente Usura utensile</tooling_family_param_dynamicCompensation>
+  <tooling_family_param_minLoadDynamicCompensation>Carico Minimo</tooling_family_param_minLoadDynamicCompensation>
+  <tooling_family_param_maxLoadDynamicCompensation>Carico Massimo</tooling_family_param_maxLoadDynamicCompensation>
   <tooling_family_param_lifeType>Tipo Vita</tooling_family_param_lifeType>
   <tooling_family_param_nominalLife>Vita Nominale</tooling_family_param_nominalLife>
   <tooling_family_param_reviveDelta>Δ Ravvivatura ut.</tooling_family_param_reviveDelta>  
@@ -365,6 +367,7 @@
   <tooling_equipment_cedgepar_wearLenght>Usura Lunghezza</tooling_equipment_cedgepar_wearLenght> 
   <tooling_equipment_cedgepar_wearLength>Usura Lunghezza</tooling_equipment_cedgepar_wearLength>
   <tooling_equipment_cedgepar_wearRadius>Usura Raggio</tooling_equipment_cedgepar_wearRadius> 
+  <tooling_equipment_cedgepar_wearDiameter>Usura Diametro</tooling_equipment_cedgepar_wearDiameter> 
   <tooling_equipment_cedgepar_teeth>N. Denti</tooling_equipment_cedgepar_teeth>    
   <tooling_equipment_cedgepar_cornerRadius>Raggio Raccordo Angolare</tooling_equipment_cedgepar_cornerRadius>
   <tooling_equipment_cedgepar_geomLenght1>Lunghezza Geometria Ut. 1</tooling_equipment_cedgepar_geomLenght1>
@@ -449,7 +452,29 @@
   <physical_type_position_select_loader>Caricatore</physical_type_position_select_loader>
   <physical_type_position_select_transfer_location>Posizione di trasferimento</physical_type_position_select_transfer_location>
   <physical_type_position_select_loading_station>Stazione di carico</physical_type_position_select_loading_station>
-  <physical_type_position_select_loading_point>Punto di carico</physical_type_position_select_loading_point>
+  <physical_type_position_select_loading_point>Punto di carico</physical_type_position_select_loading_point>  
+  <tooling_equipment_list_select_disk>Disco</tooling_equipment_list_select_disk>
+  <tooling_equipment_list_select_cutter50>Coltellino 50%%</tooling_equipment_list_select_cutter50>
+  <tooling_equipment_list_select_cutter70>Coltellino 70%%</tooling_equipment_list_select_cutter70>
+  <tooling_equipment_list_select_cutter80>Coltellino 80%%</tooling_equipment_list_select_cutter80>
+  <tooling_equipment_list_select_blade1>Lama 1</tooling_equipment_list_select_blade1>
+  <tooling_equipment_list_select_blade2>Lama 2</tooling_equipment_list_select_blade2>
+  <tooling_equipment_list_select_blade3>Lama 3</tooling_equipment_list_select_blade3>
+  <tooling_equipment_list_select_blade4>Lama 4</tooling_equipment_list_select_blade4>
+  <tooling_equipment_list_select_blade5>Lama 5</tooling_equipment_list_select_blade5>
+  <tooling_equipment_list_select_blade6>Lama 6</tooling_equipment_list_select_blade6>
+  <tooling_equipment_list_select_blade7>Lama 7</tooling_equipment_list_select_blade7>
+  <tooling_equipment_list_select_blade300>Lama Ø300</tooling_equipment_list_select_blade300>
+  <tooling_equipment_list_select_blade400>Lama Ø400</tooling_equipment_list_select_blade400>
+  <tooling_equipment_list_select_blade500>Lama Ø500</tooling_equipment_list_select_blade500>
+  <tooling_equipment_list_select_radioProbe1.1>Radio Probe 1 - Ricevitore 1</tooling_equipment_list_select_radioProbe1.1>
+  <tooling_equipment_list_select_radioProbe1.2>Radio Probe 2 - Ricevitore 1</tooling_equipment_list_select_radioProbe1.2>
+  <tooling_equipment_list_select_radioProbe1.3>Radio Probe 3 - Ricevitore 1</tooling_equipment_list_select_radioProbe1.3>
+  <tooling_equipment_list_select_radioProbe1.4>Radio Probe 4 - Ricevitore 1</tooling_equipment_list_select_radioProbe1.4>
+  <tooling_equipment_list_select_radioProbe2.1>Radio Probe 1 - Ricevitore 2</tooling_equipment_list_select_radioProbe2.1>
+  <tooling_equipment_list_select_radioProbe2.2>Radio Probe 2 - Ricevitore 2</tooling_equipment_list_select_radioProbe2.2>
+  <tooling_equipment_list_select_radioProbe2.3>Radio Probe 3 - Ricevitore 2</tooling_equipment_list_select_radioProbe2.3>
+  <tooling_equipment_list_select_radioProbe2.4>Radio Probe 4 - Ricevitore 2</tooling_equipment_list_select_radioProbe2.4>
 
   <!-- Tool Manager - Message-Box --> 
   <modal_confirm_title>Richiesta di conferma</modal_confirm_title> 
diff --git a/Step.Utils/languages/en.xml b/Step.Utils/languages/en.xml
index 47059206..70239319 100644
--- a/Step.Utils/languages/en.xml
+++ b/Step.Utils/languages/en.xml
@@ -248,6 +248,8 @@
   <tooling_shanks_list_category_magazine>Magazine:</tooling_shanks_list_category_magazine>
   <tooling_magpos_list_category_general>Generics:</tooling_magpos_list_category_general>
   <tooling_families_list_category_general>Generics:</tooling_families_list_category_general>
+  <tooling_families_list_category_gamma>Inverter Dataset:</tooling_families_list_category_gamma> 
+  <tooling_families_list_category_magazine>Magazine:</tooling_families_list_category_magazine> 
   <tooling_equipment_list_category_status>Tool Status:</tooling_equipment_list_category_status>
   <tooling_equipment_list_category_offset>Offsets:</tooling_equipment_list_category_offset>  
   <tooling_shanks_list_category_balluf>Rfid:</tooling_shanks_list_category_balluf>
@@ -343,7 +345,7 @@
   <tooling_family_param_maxLoad>Max Load</tooling_family_param_maxLoad>  
   <tooling_family_param_minLoadPctAutoload>Min Load</tooling_family_param_minLoadPctAutoload>
   <tooling_family_param_maxLoadPctAutoload>Max Load</tooling_family_param_maxLoadPctAutoload>
-  <tooling_family_param_dynamicCompensation>Dynamic Compensation</tooling_family_param_dynamicCompensation>
+  <tooling_family_param_dynamicCompensation>Tool Wear Coefficient</tooling_family_param_dynamicCompensation>
   <tooling_family_param_minLoadDynamicCompensation>Min Load</tooling_family_param_minLoadDynamicCompensation>
   <tooling_family_param_maxLoadDynamicCompensation>Max Load</tooling_family_param_maxLoadDynamicCompensation>
   <tooling_family_param_lifeType>Lyfe Type</tooling_family_param_lifeType>
@@ -362,7 +364,8 @@
   <tooling_equipment_cedgepar_radius>Radius</tooling_equipment_cedgepar_radius> 
   <tooling_equipment_cedgepar_wearLenght>Δ Lenght</tooling_equipment_cedgepar_wearLenght> 
   <tooling_equipment_cedgepar_wearLength>Δ Lenght</tooling_equipment_cedgepar_wearLength>
-  <tooling_equipment_cedgepar_wearRadius>Δ Radius</tooling_equipment_cedgepar_wearRadius> 
+  <tooling_equipment_cedgepar_wearRadius>Δ Radius</tooling_equipment_cedgepar_wearRadius>
+  <tooling_equipment_cedgepar_wearDiameter>Δ Diameter</tooling_equipment_cedgepar_wearDiameter>   
   <tooling_equipment_cedgepar_teeth>Theeth No.</tooling_equipment_cedgepar_teeth>   
   <tooling_equipment_cedgepar_cornerRadius>Corner Radius</tooling_equipment_cedgepar_cornerRadius>
   <tooling_equipment_cedgepar_geomLenght1>Geometry Lenght 1</tooling_equipment_cedgepar_geomLenght1>
@@ -447,7 +450,29 @@
   <physical_type_position_select_loader>Loader</physical_type_position_select_loader>
   <physical_type_position_select_transfer_location>Transfer Position</physical_type_position_select_transfer_location>
   <physical_type_position_select_loading_station>Loading Station</physical_type_position_select_loading_station>
-  <physical_type_position_select_loading_point>Loading Point</physical_type_position_select_loading_point>
+  <physical_type_position_select_loading_point>Loading Point</physical_type_position_select_loading_point> 
+  <tooling_equipment_list_select_disk>Disk</tooling_equipment_list_select_disk>
+  <tooling_equipment_list_select_cutter50>Cutter 50%%</tooling_equipment_list_select_cutter50>
+  <tooling_equipment_list_select_cutter70>Cutter 70%%</tooling_equipment_list_select_cutter70>
+  <tooling_equipment_list_select_cutter80>Cutter 80%%</tooling_equipment_list_select_cutter80>
+  <tooling_equipment_list_select_blade1>Blade 1</tooling_equipment_list_select_blade1>
+  <tooling_equipment_list_select_blade2>Blade 2</tooling_equipment_list_select_blade2>
+  <tooling_equipment_list_select_blade3>Blade 3</tooling_equipment_list_select_blade3>
+  <tooling_equipment_list_select_blade4>Blade 4</tooling_equipment_list_select_blade4>
+  <tooling_equipment_list_select_blade5>Blade 5</tooling_equipment_list_select_blade5>
+  <tooling_equipment_list_select_blade6>Blade 6</tooling_equipment_list_select_blade6>
+  <tooling_equipment_list_select_blade7>Blade 7</tooling_equipment_list_select_blade7>
+  <tooling_equipment_list_select_blade300>Blade Ø300</tooling_equipment_list_select_blade300>
+  <tooling_equipment_list_select_blade400>Blade Ø400</tooling_equipment_list_select_blade400>
+  <tooling_equipment_list_select_blade500>Blade Ø500</tooling_equipment_list_select_blade500>
+  <tooling_equipment_list_select_radioProbe1.1>Radio Probe 1 - Reciever 1</tooling_equipment_list_select_radioProbe1.1>
+  <tooling_equipment_list_select_radioProbe1.2>Radio Probe 2 - Reciever 1</tooling_equipment_list_select_radioProbe1.2>
+  <tooling_equipment_list_select_radioProbe1.3>Radio Probe 3 - Reciever 1</tooling_equipment_list_select_radioProbe1.3>
+  <tooling_equipment_list_select_radioProbe1.4>Radio Probe 4 - Reciever 1</tooling_equipment_list_select_radioProbe1.4>
+  <tooling_equipment_list_select_radioProbe2.1>Radio Probe 1 - Reciever 2</tooling_equipment_list_select_radioProbe2.1>
+  <tooling_equipment_list_select_radioProbe2.2>Radio Probe 2 - Reciever 2</tooling_equipment_list_select_radioProbe2.2>
+  <tooling_equipment_list_select_radioProbe2.3>Radio Probe 3 - Reciever 2</tooling_equipment_list_select_radioProbe2.3>
+  <tooling_equipment_list_select_radioProbe2.4>Radio Probe 4 - Reciever 2</tooling_equipment_list_select_radioProbe2.4>  
 
   <!-- Tool Manager - Message-Box --> 
   <modal_confirm_title>Confirm Operation</modal_confirm_title> 
diff --git a/Step/wwwroot/src/@types/tooling.d.ts b/Step/wwwroot/src/@types/tooling.d.ts
index 9a836b47..c3b43d34 100644
--- a/Step/wwwroot/src/@types/tooling.d.ts
+++ b/Step/wwwroot/src/@types/tooling.d.ts
@@ -16,6 +16,7 @@ declare module server {
     familyOptionActive: boolean
     magPositionOptionActive: boolean
     offsetOptionActive: boolean
+    radiusMetricType:boolean;
   }
 
   export interface EdgesConfiguration {
diff --git a/Step/wwwroot/src/app_modules/tooling/components/tooling.ts b/Step/wwwroot/src/app_modules/tooling/components/tooling.ts
index b5d3c33c..f7abe6b9 100644
--- a/Step/wwwroot/src/app_modules/tooling/components/tooling.ts
+++ b/Step/wwwroot/src/app_modules/tooling/components/tooling.ts
@@ -24,7 +24,7 @@ export default class Tooling extends Vue {
   }
   public get familyOptionActive(): boolean {
     return (this.$store.state as AppModel).tooling.familyOptionActive;
-  }
+  }  
   public get magPositionOptionActive(): boolean {
     return (this.$store.state as AppModel).tooling.magPositionOptionActive;
   }
diff --git a/Step/wwwroot/src/filters/localizeFilter.ts b/Step/wwwroot/src/filters/localizeFilter.ts
index 788f9d0d..d231be3c 100644
--- a/Step/wwwroot/src/filters/localizeFilter.ts
+++ b/Step/wwwroot/src/filters/localizeFilter.ts
@@ -7,7 +7,11 @@ Vue.filter("localize", function (key: string, defaultValue: string, ...args): st
   let labels = (store.state as AppModel).localization.labels;
 
   let isSiemens = (store.state as AppModel).machineInfo.isSiemens;
+  let isRadius = (store.state as AppModel).tooling.radiusMetricType;
 
+  if(!isRadius)
+    key = key.replace("radius","diameter").replace("Radius","Diameter");
+  
   let value = labels[isSiemens == true ? "siemens_" + key : key];
   let dvalue = ""
   if (!value)
diff --git a/Step/wwwroot/src/services/toolingService.ts b/Step/wwwroot/src/services/toolingService.ts
index 4d23fb9f..c13d484e 100644
--- a/Step/wwwroot/src/services/toolingService.ts
+++ b/Step/wwwroot/src/services/toolingService.ts
@@ -77,6 +77,7 @@ export class ToolingService extends baseRestService {
     toolingActions.setToolsPerMultitools(store, result.maxToolsPerMultitools);
     toolingActions.setMultitoolOptionActive(store, result.multitoolOptionActive);
     toolingActions.setFamilyOptionActive(store, result.familyOptionActive);
+    toolingActions.setRadiusMetricType(store, result.radiusMetricType);
     toolingActions.setOffsetOptionActive(store, result.offsetOptionActive);
     toolingActions.setMagPositionOptionActive(store, result.magPositionOptionActive);
     toolingActions.updateToolsConfigurations(store, result.toolsConfiguration);
diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts
index 693867fb..5532cd25 100644
--- a/Step/wwwroot/src/store/tooling.store.ts
+++ b/Step/wwwroot/src/store/tooling.store.ts
@@ -33,6 +33,7 @@ export interface ToolingStoreModel {
   familyOptionActive: boolean
   magPositionOptionActive: boolean
   offsetOptionActive: boolean
+  radiusMetricType: boolean
 }
 
 export interface ToolingGetters{
@@ -101,6 +102,7 @@ export interface ToolingActions {
   setToolsPerMultitools(context, number);
   setMultitoolOptionActive(context, multitoolOptionActive: boolean);
   setFamilyOptionActive(context, familyOptionActive: boolean);
+  setRadiusMetricType(context, radiusMetricType: boolean);
   setOffsetOptionActive(context, offsetOptionActive: boolean);
   setMagPositionOptionActive(context, magPositionOptionActive: boolean);  
   setCanLoadTool(context, sizeRight,sizeLeft,magazineType,tools);
@@ -154,7 +156,8 @@ export const toolingStore = {
     multitoolOptionActive: false,
     familyOptionActive: false,
     magPositionOptionActive: false,
-    offsetOptionActive: false
+    offsetOptionActive: false,
+    radiusMetricType:false
   } as ToolingStoreModel,
   getters:{
     toolIsInWarning : (state) => (id) : boolean =>{
@@ -417,6 +420,9 @@ export const toolingStore = {
     SetFamilyOptionActive(store, familyOptionActive){
       store.familyOptionActive = familyOptionActive;
     },
+    SetRadiusMetricType(store, RadiusMetricType){
+      store.radiusMetricType = RadiusMetricType;
+    },    
     SetOffsetOptionActive(store, offsetOptionActive){
       store.offsetOptionActive = offsetOptionActive;
     },
@@ -707,6 +713,9 @@ export const toolingStore = {
     setFamilyOptionActive(context, familyOptionActive: boolean){
       context.commit("SetFamilyOptionActive", familyOptionActive);
     },
+    setRadiusMetricType(context, radiusMetricType: boolean){
+      context.commit("SetRadiusMetricType", radiusMetricType);
+    },
     setOffsetOptionActive(context, offsetOptionActive: boolean){
       context.commit("SetOffsetOptionActive", offsetOptionActive);
     },