diff --git a/Step/wwwroot/src/components/tooling-magpos.ts b/Step/wwwroot/src/components/tooling-magpos.ts
index 88974b2d..4cc66da9 100644
--- a/Step/wwwroot/src/components/tooling-magpos.ts
+++ b/Step/wwwroot/src/components/tooling-magpos.ts
@@ -27,10 +27,9 @@ export default class toolingMagPos extends Vue {
   public cancel = function (path:string) {
     this.$router.push({ path: path});
   }
+  async modify(model) {
 
-  async modify(item){
-    await new ToolingService().UpdateMagPos(item).then(response => {
-      this.selectedTool = response;
+    new ToolingService().UpdateMagPos(model).then(response => {
       this.magposConfiguration = (this.$store.state as AppModel).tooling.magazinePosConfiguration;
     });
   }
diff --git a/Step/wwwroot/src/components/tooling-magpos.vue b/Step/wwwroot/src/components/tooling-magpos.vue
index 82fd18cf..fe4ccd03 100644
--- a/Step/wwwroot/src/components/tooling-magpos.vue
+++ b/Step/wwwroot/src/components/tooling-magpos.vue
@@ -21,7 +21,7 @@
                   </div>
                   <div class="list-vertical scrollable">
                       <equipment v-for="(m,k) in magpos" :key="k" :code="'Magazzino' + ' ' + m.magazineId" :title="'Manina' + ' ' + m.id"
-                                 :class="{selected: selectedTool == m}"
+                                 :class="{selected: selectedTool && selectedTool.id == m.id && selectedTool.magazineId == m.magazineId}"
                                  :img-source="'../assets/images/list-mag-pos.PNG'"
                                  @click="selectTool(m)"></equipment>
                   </div>
@@ -36,121 +36,13 @@
                         <input-box v-for="m in magposConfiguration" :key="m.name"
                                    v-if="m.name != ''"
                                    v-model="selectedTool[m.name]"
+                                   :read-only="m.readOnly"
                                    :title="m.name | localize(m.name)" :type="m.type">
                                    <option v-for="s in m.selectValues" :key="s" :value="s">{{s}}</option>
                         </input-box>
-                        <!-- <input-box title="Id" type="numeric" :read-only="true"></input-box>
-
-                        <input-box title="Tipo Utensile" type="select">
-                            <option :value="3">tre</option>
-                        </input-box> -->
                     </div>
-                    <!-- <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
-                        <input-box title="Nome" type="text" :read-only="true"></input-box>
-                        <input-box title="Id Figlio" type="numeric" :read-only="true"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_state' | localize("Stato")}}</div>
-                        <input-box title="Ut. Attivato" type="toggle"></input-box>
-                        <input-box title="Ut. Inibito" type="toggle"></input-box>
-                        <input-box title="Ut. Misurato" type="toggle"></input-box>
-                        <input-box title="Ut. in Preali" type="toggle"></input-box>
-                        <input-box title="Ut. in CU" type="toggle"></input-box>
-                        <input-box title="Ut. Posto fisso" type="toggle"></input-box>
-                        <input-box title="Ut. in uso" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_head' | localize("Testa")}}</div>
-                        <input-box title="Rotazione" type="select"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category"></div>
-                        <input-box title="Raffredd 1" type="toggle"></input-box>
-                        <input-box title="Raffredd 2" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_dimensiondepot' | localize("Dimensione in magazzino")}}</div>
-                        <input-box title="N. Manine Dx" type="numeric"></input-box>
-                        <pre>data: {{$data}}</pre>
-                        <input-box title="N. Manine Sx" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_general' | localize("Generali")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_geometry' | localize("Geometria")}}</div>
-                        <input-box title="Parameter 1..N" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}Vita Ut.</div>
-                        <input-box title="Tipo Vita" type="select"></input-box>
-                        <input-box title="Vita residua" type="numeric"></input-box>
-                        <input-box title="Vita Nominale" type="numeric"></input-box>
-                        <input-box title="Vita Preallarme" type="numeric"></input-box>
-                    </div> -->
                   </div>
               </div>
-              <!-- Osai - Fanuc -->
-              <!-- <div class="box-right" v-if="false">
-                  <button class="btn"><i class="fa fa-trash"></i></button>
-                  <div class="box-right-label-header">Modifica di E13 utensile XYZ</div>
-                  <div class="list-skill-equipment scrollable">
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_general' | localize("Generali")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                        <input-box title="Tipo Utensile" type="select"></input-box>
-                        <input-box title="Ut. Disabilitato" type="toggle"></input-box>
-                        <input-box title="Ut. Rotto" type="toggle"></input-box>
-                        <input-box title="Ut. Misurato" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                        <input-box title="Descrizione" type="text"></input-box>
-                        <input-box title="Rotazione" type="select"></input-box>
-                        <input-box title="Tcp Associata" type="select"></input-box>
-                        <input-box title="Raffredd 1" type="toggle"></input-box>
-                        <input-box title="Raffredd 2" type="toggle"></input-box>
-                        <input-box title="Raffredd 3" type="toggle"></input-box>
-                        <input-box title="Raffredd 4" type="toggle"></input-box>
-                        <input-box title="Raffredd 5" type="toggle"></input-box>
-                        <input-box title="Raffredd 6" type="toggle"></input-box>
-                        <input-box title="Raffredd 7" type="toggle"></input-box>
-                        <input-box title="Raffredd 8" type="toggle"></input-box>
-                        <input-box title="Vita Nominale" type="numeric"></input-box>
-                        <input-box title="Delta Ravvivat" type="numeric"></input-box>
-                        <input-box title="Inverter Dataset" type="select"></input-box>
-                        <input-box title="Carico Min P.A." type="numeric"></input-box>
-                        <input-box title="Carico Max P.A." type="numeric"></input-box>
-                        <input-box title="Caric Min C Din" type="numeric"></input-box>
-                        <input-box title="Caric Max C Din" type="numeric"></input-box>
-                        <input-box title="N. Manine Dx" type="numeric"></input-box>
-                        <input-box title="N. Manine Sx" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_geometry' | localize("Geometria")}}</div>
-                        <input-box title="Id Correttore" type="select"></input-box>
-                        <input-box title="Lunghezza" type="numeric"></input-box>
-                        <input-box title="Raggio" type="numeric"></input-box>
-                        <input-box title="Usura Lungh." type="numeric"></input-box>
-                        <input-box title="Usura Raggio"  type="numeric"></input-box>
-                        <input-box title="Ravviv Residua" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}</div>
-                        <input-box title="Tipo Vita" type="select"></input-box>
-                        <input-box title="Vita residua" type="numeric"></input-box>
-                        <input-box title="Val Preallarme" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_tang' | localize("Codolo")}}</div>
-                        <input-box title="Tipo man rich" type="select"></input-box>
-                        <input-box title="Pastiglia" type="numeric"></input-box>
-                    </div>
-                  </div>
-              </div> -->
           </div>
           <div class="tooling-magpos-footer">
               <button class="btn" @click="cancel('/tooling')">{{'tooling_magpos_button_cancel' | localize("Annulla")}}</button>
diff --git a/Step/wwwroot/src/components/tooling-shanks.ts b/Step/wwwroot/src/components/tooling-shanks.ts
index 30934d5b..235f1f99 100644
--- a/Step/wwwroot/src/components/tooling-shanks.ts
+++ b/Step/wwwroot/src/components/tooling-shanks.ts
@@ -49,15 +49,6 @@ export default class toolingShanks extends Vue {
     });
   }
 
-  public classSelectedTool(item){
-    if(item && this.selectedTool && this.selectedTool.id == item.id){
-      return true;
-    }
-    else{
-      return false;
-    }
-  }
-
   public addShank(){
     this.selectedTool = {};
     this.shankConfiguration = [];
@@ -97,27 +88,27 @@ export default class toolingShanks extends Vue {
     this.$router.push({ path: path});
   }
 
-  async save(item){
-    await new ToolingService().SetShank(item).then(response => {
+  async save(item) {
+    debugger
+    new ToolingService().SetShank(item).then(response => {
       this.selectedTool = response;
-
       let htmlelement = this.$refs.shankList as any;
       htmlelement.scrollTop = htmlelement.scrollHeight;
-    });
-    this.classSelectedTool(item);
-    this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration;
-    await new ToolingService().GetShanks();
-  }
-  async deleteShank(id){
-    await new ToolingService().DeleteShank(id).then(response => {
-      this.selectedTool = null;
-    });
-    await new ToolingService().GetShanks();
-  }
-  async modify(item){
-    await new ToolingService().UpdateShank(item).then(response => {
-      this.selectedTool = response;
+
       this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration;
     });
   }
+
+  async modify(model) {
+
+    new ToolingService().UpdateShank(model).then(response => {
+      this.shankConfiguration = (this.$store.state as AppModel).tooling.shankConfiguration;
+    });
+  }
+
+  async deleteShank(model) {
+    new ToolingService().DeleteShank(model).then(response => {
+      this.selectedTool = null;
+    });
+  }
 }
diff --git a/Step/wwwroot/src/components/tooling-shanks.vue b/Step/wwwroot/src/components/tooling-shanks.vue
index 81dbada3..3375b9e2 100644
--- a/Step/wwwroot/src/components/tooling-shanks.vue
+++ b/Step/wwwroot/src/components/tooling-shanks.vue
@@ -22,7 +22,7 @@
                   <div class="list-vertical scrollable" ref="shankList">
                       <equipment v-for="s in shanks" :key="s.id" :title="'Codolo' + ' ' + s.id"
                                  v-if="s.id != null"
-                                 :class="{selected: classSelectedTool(s)}"
+                                 :class="{selected: selectedTool && selectedTool.id == s.id}"
                                  @click="selectTool(s)"></equipment>
                   </div>
                   <div class="footer">
@@ -41,7 +41,7 @@
                     </div>
                 </div>
                 <div class="box-right-body" v-if="enableParameters">
-                  <button class="btn" @click="deleteShank(selectedTool.id)"><i class="fa fa-trash"></i></button>
+                  <button class="btn" @click="deleteShank(selectedTool)"><i class="fa fa-trash"></i></button>
                   <div class="box-right-label-header">{{'tooling_shanks_boxright_header_modify' | localize("Modifica di Codolo")}} {{selectedTool.id}}</div>
                   <div class="list-skill-shanks scrollable">
                     <div class="list-skill-shanks-category" v-for="c in categories" :key="c">
@@ -53,63 +53,7 @@
                                    :title="s.name | localize(s.name)" :type="s.type">
                                    <option v-for="v in s.selectValues" :key="v" :value="v">{{v}}</option>
                         </input-box>
-                        <!-- <input-box v-for="f in fieldsConfiguration" :key="f.name"
-                                   v-if="f.name != ''"
-                                   v-model="selectedTool[f.name]"
-                                   :title="f.name | localize(f.name)" :type="f.type">
-                                   <option v-for="t in f.selectValues" :key="t" :value="t">{{t}}</option>
-                        </input-box> -->
-                        <!-- <input-box title="Id" type="numeric" :read-only="true"></input-box>
-
-                        <input-box title="Tipo Utensile" type="select">
-                            <option :value="3">tre</option>
-                        </input-box> -->
                     </div>
-                    <!-- <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
-                        <input-box title="Nome" type="text" :read-only="true"></input-box>
-                        <input-box title="Id Figlio" type="numeric" :read-only="true"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_state' | localize("Stato")}}</div>
-                        <input-box title="Ut. Attivato" type="toggle"></input-box>
-                        <input-box title="Ut. Inibito" type="toggle"></input-box>
-                        <input-box title="Ut. Misurato" type="toggle"></input-box>
-                        <input-box title="Ut. in Preali" type="toggle"></input-box>
-                        <input-box title="Ut. in CU" type="toggle"></input-box>
-                        <input-box title="Ut. Posto fisso" type="toggle"></input-box>
-                        <input-box title="Ut. in uso" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_head' | localize("Testa")}}</div>
-                        <input-box title="Rotazione" type="select"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category"></div>
-                        <input-box title="Raffredd 1" type="toggle"></input-box>
-                        <input-box title="Raffredd 2" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_dimensiondepot' | localize("Dimensione in magazzino")}}</div>
-                        <input-box title="N. Manine Dx" type="numeric"></input-box>
-                        <pre>data: {{$data}}</pre>
-                        <input-box title="N. Manine Sx" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_general' | localize("Generali")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_geometry' | localize("Geometria")}}</div>
-                        <input-box title="Parameter 1..N" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}Vita Ut.</div>
-                        <input-box title="Tipo Vita" type="select"></input-box>
-                        <input-box title="Vita residua" type="numeric"></input-box>
-                        <input-box title="Vita Nominale" type="numeric"></input-box>
-                        <input-box title="Vita Preallarme" type="numeric"></input-box>
-                    </div> -->
                   </div>
                 </div>
                 <div class="box-right-body" v-if="enableEquipment">
@@ -127,126 +71,10 @@
                                    <option v-for="(s, k) in c.selectValues" :key="k" :selected="ct.toolType" :value="k">{{s}}</option>
                             </input-box>
                         </div>
-                        <!-- <input-box v-for="f in fieldsConfiguration" :key="f.name"
-                                   v-if="f.name != ''"
-                                   v-model="selectedTool[f.name]"
-                                   :title="f.name | localize(f.name)" :type="f.type">
-                                   <option v-for="t in f.selectValues" :key="t" :value="t">{{t}}</option>
-                        </input-box> -->
-                        <!-- <input-box title="Id" type="numeric" :read-only="true"></input-box>
-
-                        <input-box title="Tipo Utensile" type="select">
-                            <option :value="3">tre</option>
-                        </input-box> -->
                     </div>
-                    <!-- <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
-                        <input-box title="Nome" type="text" :read-only="true"></input-box>
-                        <input-box title="Id Figlio" type="numeric" :read-only="true"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_state' | localize("Stato")}}</div>
-                        <input-box title="Ut. Attivato" type="toggle"></input-box>
-                        <input-box title="Ut. Inibito" type="toggle"></input-box>
-                        <input-box title="Ut. Misurato" type="toggle"></input-box>
-                        <input-box title="Ut. in Preali" type="toggle"></input-box>
-                        <input-box title="Ut. in CU" type="toggle"></input-box>
-                        <input-box title="Ut. Posto fisso" type="toggle"></input-box>
-                        <input-box title="Ut. in uso" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_head' | localize("Testa")}}</div>
-                        <input-box title="Rotazione" type="select"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category"></div>
-                        <input-box title="Raffredd 1" type="toggle"></input-box>
-                        <input-box title="Raffredd 2" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_dimensiondepot' | localize("Dimensione in magazzino")}}</div>
-                        <input-box title="N. Manine Dx" type="numeric"></input-box>
-                        <pre>data: {{$data}}</pre>
-                        <input-box title="N. Manine Sx" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_general' | localize("Generali")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_sharp_geometry' | localize("Geometria")}}</div>
-                        <input-box title="Parameter 1..N" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}Vita Ut.</div>
-                        <input-box title="Tipo Vita" type="select"></input-box>
-                        <input-box title="Vita residua" type="numeric"></input-box>
-                        <input-box title="Vita Nominale" type="numeric"></input-box>
-                        <input-box title="Vita Preallarme" type="numeric"></input-box>
-                    </div> -->
                   </div>
                 </div>
               </div>
-
-              <!-- Osai - Fanuc -->
-              <!-- <div class="box-right" v-if="false">
-                  <button class="btn"><i class="fa fa-trash"></i></button>
-                  <div class="box-right-label-header">Modifica di E13 utensile XYZ</div>
-                  <div class="list-skill-equipment scrollable">
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_general' | localize("Generali")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                        <input-box title="Tipo Utensile" type="select"></input-box>
-                        <input-box title="Ut. Disabilitato" type="toggle"></input-box>
-                        <input-box title="Ut. Rotto" type="toggle"></input-box>
-                        <input-box title="Ut. Misurato" type="toggle"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_family' | localize("Famiglia")}}</div>
-                        <input-box title="Id" type="numeric" :read-only="true"></input-box>
-                        <input-box title="Descrizione" type="text"></input-box>
-                        <input-box title="Rotazione" type="select"></input-box>
-                        <input-box title="Tcp Associata" type="select"></input-box>
-                        <input-box title="Raffredd 1" type="toggle"></input-box>
-                        <input-box title="Raffredd 2" type="toggle"></input-box>
-                        <input-box title="Raffredd 3" type="toggle"></input-box>
-                        <input-box title="Raffredd 4" type="toggle"></input-box>
-                        <input-box title="Raffredd 5" type="toggle"></input-box>
-                        <input-box title="Raffredd 6" type="toggle"></input-box>
-                        <input-box title="Raffredd 7" type="toggle"></input-box>
-                        <input-box title="Raffredd 8" type="toggle"></input-box>
-                        <input-box title="Vita Nominale" type="numeric"></input-box>
-                        <input-box title="Delta Ravvivat" type="numeric"></input-box>
-                        <input-box title="Inverter Dataset" type="select"></input-box>
-                        <input-box title="Carico Min P.A." type="numeric"></input-box>
-                        <input-box title="Carico Max P.A." type="numeric"></input-box>
-                        <input-box title="Caric Min C Din" type="numeric"></input-box>
-                        <input-box title="Caric Max C Din" type="numeric"></input-box>
-                        <input-box title="N. Manine Dx" type="numeric"></input-box>
-                        <input-box title="N. Manine Sx" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_geometry' | localize("Geometria")}}</div>
-                        <input-box title="Id Correttore" type="select"></input-box>
-                        <input-box title="Lunghezza" type="numeric"></input-box>
-                        <input-box title="Raggio" type="numeric"></input-box>
-                        <input-box title="Usura Lungh." type="numeric"></input-box>
-                        <input-box title="Usura Raggio"  type="numeric"></input-box>
-                        <input-box title="Ravviv Residua" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_life_equipment' | localize("Vita Ut.")}}</div>
-                        <input-box title="Tipo Vita" type="select"></input-box>
-                        <input-box title="Vita residua" type="numeric"></input-box>
-                        <input-box title="Val Preallarme" type="numeric"></input-box>
-                    </div>
-                    <div class="list-skill-equipment-category">
-                        <div class="skill-equipment-category">{{'fanuc_tooling_equipment_list_category_tang' | localize("Codolo")}}</div>
-                        <input-box title="Tipo man rich" type="select"></input-box>
-                        <input-box title="Pastiglia" type="numeric"></input-box>
-                    </div>
-                  </div>
-              </div> -->
           </div>
           <div class="tooling-shanks-footer">
               <button class="btn" @click="cancel('/tooling')">{{'tooling_shanks_button_cancel' | localize("Annulla")}}</button>
diff --git a/Step/wwwroot/src/services/toolingService.ts b/Step/wwwroot/src/services/toolingService.ts
index d0d4acf6..5ce8dac0 100644
--- a/Step/wwwroot/src/services/toolingService.ts
+++ b/Step/wwwroot/src/services/toolingService.ts
@@ -113,7 +113,7 @@ export class ToolingService extends baseRestService {
   }
   async SetShank(model: any) {
     var response = await this.Post<any>("/api/tool_table/shank", model);
-    toolingActions.updateShank(store, model);
+    toolingActions.updateShank(store, response);
     return response;
   }
   async SetSiemensTool(model: any) {
@@ -128,9 +128,9 @@ export class ToolingService extends baseRestService {
     return result;
   }
 
-  async DeleteShank(id: any) {
-    var result = await this.Delete<any>("/api/tool_table/shank/" + id);
-    toolingActions.deleteShank(store, id);
+  async DeleteShank(model: any) {
+    var result = await this.Delete<any>("/api/tool_table/shank/" + model.id);
+    toolingActions.deleteShank(store, model);
     return result;
   }
   async UpdateShank(model: server.Shanks){
diff --git a/Step/wwwroot/src/store/tooling.store.ts b/Step/wwwroot/src/store/tooling.store.ts
index aee8ac24..f82c6d29 100644
--- a/Step/wwwroot/src/store/tooling.store.ts
+++ b/Step/wwwroot/src/store/tooling.store.ts
@@ -45,7 +45,7 @@ export interface ToolingActions {
   updateEdgeAdditionalParamsConfiguration(context, model: Map<string, Array<string>>);
 
   deleteFamily(context, familyName: string);
-  deleteShank(context, id: number);
+  deleteShank(context, model: server.Shanks);
 }
 
 export const toolingStore = {
@@ -60,7 +60,7 @@ export const toolingStore = {
     shanks: [],
     _toolsConfiguration: new Map<string, server.ToolsConfiguration>(),
     magazinesPositions: [],
-    _magazinesPositions: new Map<Array<number>, server.MagazinesPositions>(),
+    _magazinesPositions: new Map<string, server.MagazinesPositions>(),
     magazinePosConfiguration: [],
     _magazinePosConfiguration: new Map<string, server.MagazinePosConfiguration>(),
     familyConfiguration: [],
@@ -101,7 +101,7 @@ export const toolingStore = {
       store.shanks = Array.from(store._shanks.values());
     },
     UpdateMagazinePosition(store, model: server.MagazinesPositions) {
-      store._magazinesPositions.set([model.id, model.magazineId], model);
+      store._magazinesPositions.set(model.id + "-" + model.magazineId, model);
       store.magazinesPositions = Array.from(store._magazinesPositions.values());
     },
     UpdateToolsConfiguration(store, model: server.ToolsConfiguration) {
@@ -139,25 +139,17 @@ export const toolingStore = {
       store._families.delete(model.uid);
       store.families = Array.from(store._families.values());
     },
-    DeleteShank(store, model: number) {
-
-      store._shanks.forEach((v, k, m) => {
-
-        if (v.id == model) {
-          store._shanks.delete(k);
-          var idx = store.shanks.indexOf(v);
-          store.shanks.splice(idx, 1);
-          return;
-        }
-      });
+    DeleteShank(store, model: server.Shanks) {
+      store._shanks.delete(model.id);
+      store.shanks = Array.from(store._shanks.values());
     },
   },
   actions: {
     deleteFamily(context, familyname: string) {
       context.commit("DeleteFamily", familyname);
     },
-    deleteShank(context, id: number) {
-      context.commit("DeleteShank", id);
+    deleteShank(context, model: server.Shanks) {
+      context.commit("DeleteShank", model);
     },
     modifyFamily(context, { oldName, model }) {
       context.commit("ModifyFamily", { oldName, model });