diff --git a/Step/wwwroot/src/components/tooling-equipment.ts b/Step/wwwroot/src/components/tooling-equipment.ts
index 32bf1db3..abd5a7ff 100644
--- a/Step/wwwroot/src/components/tooling-equipment.ts
+++ b/Step/wwwroot/src/components/tooling-equipment.ts
@@ -15,6 +15,7 @@ export default class toolingEquipment extends Vue {
   public get edgeConfiguration(): server.EdgeConfiguration[] { return (this.$store.state as AppModel).tooling.edgesConfiguration; }
 
   public selectedTool: any = null;
+  public selectedEquipment: any = null;
 
   public get categories(): string[] {
     let cat: Set<string>= new Set<string>();
@@ -59,12 +60,15 @@ export default class toolingEquipment extends Vue {
     if(elem == 'Parameters'){
       this.enableParameters = true;
       this.enableEquipment = false;
+      this.selectedEquipment = null;
     }
     else if (elem){
-      this.enableEquipment = elem;
+      this.selectedEquipment = elem;
+      this.enableEquipment = true;
       this.enableParameters = false;
     }
     else{
+      this.selectedEquipment = null;
       this.enableParameters = true;
       this.enableEquipment = false;
     }
@@ -83,8 +87,22 @@ export default class toolingEquipment extends Vue {
       return "../assets/images/list-tool.PNG"
   }
 
+  private internalCounter = -1;
   public addEdge(){
-    this.selectedTool.edgesData.push({});
+    debugger;
+    var obj  = { edgeAdditionalParams:{}};
+    for (const key in this.edgeConfiguration) {
+        const element = this.edgeConfiguration[key];
+        obj[element.name] = null;
+    }
+
+    let fields = this.getDynamicFields(this.selectedTool.toolType);
+    for (const key in fields) {
+        const element = fields[key];
+        obj.edgeAdditionalParams[element] = null;
+    }
+    obj["id"] =  this.internalCounter--;
+    this.selectedTool.edgesData.push(obj);
   }
 
 
diff --git a/Step/wwwroot/src/components/tooling-equipment.vue b/Step/wwwroot/src/components/tooling-equipment.vue
index dd04cd2c..af15e39f 100644
--- a/Step/wwwroot/src/components/tooling-equipment.vue
+++ b/Step/wwwroot/src/components/tooling-equipment.vue
@@ -29,12 +29,11 @@
                       <div class="group-label-button">{{'tooling_equipment_label_add' | localize("Aggiungi utensile")}}<button class="btn"><i class="fa fa-plus"></i></button></div>
                   </div>
               </div>
-
               <div class="box-right" v-if="selectedTool">
                 <div class="tab-box-right">
                     <button class="tab" :class="{'active': enableParameters}" @click="selectTab('Parameters')">Parametri</button>
                     <div class="tab-box-scroll scrollable">
-                        <button v-for="ed in selectedTool.edgesData" :key="ed" class="tab" :class="{'active': enableEquipment == ed}" @click="selectTab(ed)">{{'tooling_edgesdataequip_skill_tools' | localize("Tagliente")}} {{ed.id}}</button>
+                        <button v-for="ed in selectedTool.edgesData" :key="ed.id" class="tab" :class="{'active': selectedEquipment == ed}" @click="selectTab(ed)">{{'tooling_edgesdataequip_skill_tools' | localize("Tagliente")}} {{ed.id}}</button>
                         <button class="tab" :class="{'active': enableParameters}" @click="addEdge()">+</button>
                     </div>
                 </div>
@@ -51,16 +50,14 @@
                                    :title="t.name | localize(t.name)" :type="t.type">
                                    <option v-for="(s, k) in t.selectValues" :key="k" :selected="selectedTool[t.name]" :value="k">{{s}}</option>
                         </input-box>
-
                     </div>
-
                   </div>
               </div>
               <div class="box-right-body" v-if="enableEquipment">
                   <button class="btn"><i class="fa fa-trash"></i></button>
-                  <div class="box-right-label-header">{{'tooling_edgesdata_skill_tools' | localize("Tagliente")}} {{enableEquipment.id}}</div>
+                  <div class="box-right-label-header">{{'tooling_edgesdata_skill_tools' | localize("Tagliente")}} {{(selectedEquipment.id > 0 ? selectedEquipment.id : "")}}</div>
                   <div class="list-skill-equipment scrollable">
-                        <div v-for="ed in selectedTool.edgesData" :key="ed" v-if="enableEquipment == ed" class="list-skill-equipment-category" >
+                        <div v-for="ed in selectedTool.edgesData" :key="ed.id" v-if="selectedEquipment == ed" class="list-skill-equipment-category" >
                           <div v-for="c in categoriesEdge" :key="c" class="skill-equipment-category">
                             <div class="skill-equipment-category">{{'tooling_equipment_list_category_' + c | localize(c)}}</div>
                             <input-box v-for="c in edgeConfiguration" :key="c.name"
@@ -83,8 +80,6 @@
                   </div>
                 </div>
               </div>
-
-
           </div>
           <div class="tooling-equipment-footer">
               <button class="btn" @click="cancel('/tooling')">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>