diff --git a/Step/wwwroot/src/components/tooling/tooling-depot.ts b/Step/wwwroot/src/components/tooling/tooling-depot.ts
index ea3f4702..46109ddf 100644
--- a/Step/wwwroot/src/components/tooling/tooling-depot.ts
+++ b/Step/wwwroot/src/components/tooling/tooling-depot.ts
@@ -300,7 +300,7 @@ export default class depot extends Vue {
     // this.magazines;
   }
 
-  public openInfoShank(id) {
+  public dataForOpenInfoShank(id){
     let shank = (this.$store.state as AppModel).tooling.shanks.find(s => s.id == id);
     console.log(ModalHelper.infoEquipmentModal.editEnabled)
     ModalHelper.infoEquipmentModal.enableModalShank = true;
@@ -309,7 +309,28 @@ export default class depot extends Vue {
     ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
     ModalHelper.ShowModal(InfoEquipment);
   }
-  public openInfoEquipment(id) {
+  
+  public dataForOpenInfoNcShank(id){
+    let shank = (this.$store.state as AppModel).tooling.ncShanks.find(s => s.id == id);
+    console.log(ModalHelper.infoEquipmentModal.editEnabled)
+    ModalHelper.infoEquipmentModal.enableModalShank = true;
+    ModalHelper.infoEquipmentModal.enableModalTool = false;
+    ModalHelper.infoEquipmentModal.currentShank = shank;
+    ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
+    ModalHelper.ShowModal(InfoEquipment);
+  }
+  
+
+  public openInfoShank(id) {
+    if(this.typeNc == "Demo"){
+      this.dataForOpenInfoShank(id);
+    }
+    else{
+      this.dataForOpenInfoNcShank(id);
+    }
+  }
+
+  public dataForOpenInfoEquipment(id){
     let tool = (this.$store.state as AppModel).tooling.tools.find(t => t.id == id);
     if (tool) {
       ModalHelper.infoEquipmentModal.enableModalShank = false;
@@ -328,6 +349,34 @@ export default class depot extends Vue {
     }
   }
 
+  public dataForOpenInfoNcEquipment(id){
+    let tool = (this.$store.state as AppModel).tooling.ncTools.find(t => t.id == id);
+    if (tool) {
+      ModalHelper.infoEquipmentModal.enableModalShank = false;
+      ModalHelper.infoEquipmentModal.enableModalTool = true;
+      ModalHelper.infoEquipmentModal.currentEquipment = tool;
+      ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
+      ModalHelper.ShowModal(InfoEquipment);
+    }
+    else {
+      let shank = (this.$store.state as AppModel).tooling.ncShanks.find(s => s.id == id);
+      ModalHelper.infoEquipmentModal.enableModalShank = true;
+      ModalHelper.infoEquipmentModal.enableModalTool = false;
+      ModalHelper.infoEquipmentModal.currentShank = shank;
+      ModalHelper.infoEquipmentModal.editEnabled = !this.editable;
+      ModalHelper.ShowModal(InfoEquipment);
+    }
+  }
+
+  public openInfoEquipment(id) {
+    if(this.typeNc == "Demo"){
+      this.dataForOpenInfoEquipment(id);
+    }
+    else{
+      this.dataForOpenInfoNcEquipment(id);
+    }
+  }
+
   public openModalLoadDepot(positionId, positionType) {
     ModalHelper.loadDepotModal.positionType = positionType;
     ModalHelper.loadDepotModal.positionId = positionId;
diff --git a/Step/wwwroot/src/components/tooling/tooling-depot.vue b/Step/wwwroot/src/components/tooling/tooling-depot.vue
index ee836e30..4939b68a 100644
--- a/Step/wwwroot/src/components/tooling/tooling-depot.vue
+++ b/Step/wwwroot/src/components/tooling/tooling-depot.vue
@@ -129,11 +129,6 @@
                                 <tool :code="'tooling_shank_abbreviation' | localize('S%d',m.id)" :title="m.id" img-source="../assets/icons/Tools/Shanks.png" @click="openInfoShank(m.id)"></tool>
                             </div>
                         </Draggable>
-                        <Draggable  v-for="t in getNcAvaiableTools" :key="t.id">
-                            <div >
-                                <tool :code="'tooling_tool_abbreviation' | localize('T%d',t.id)" :title="t.familyId" :img-source="getInfoEquipmentIcon(t.toolType)" @click="openInfoEquipment(t.id)"></tool>
-                            </div>
-                        </Draggable>
                       </Container>
                     </div>