diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java
index daa4113f..d660e084 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java
@@ -68,34 +68,34 @@ public class CustomSword extends ItemSword implements WeaponNBT {
     public void onUpdate(ItemStack stack, World world, Entity playerin, int itemSlot, boolean isSelected) {
         if(!world.isRemote){
             if(isSelected) {
-
-                //System.out.println( + stack.getMaxDamage() * 0.6 + " : " + stack.getItemDamage() + " : " + stack.getMaxDamage() * 0.5);
-                //System.out.println(stack.getItemDamage() + ">" + stack.getMaxDamage() * 0.5);
-                //System.out.println(stack.getItemDamage() + "<" + stack.getMaxDamage() * 0.6);
-                //System.out.println(WeaponNBT.getSharpnessLevel(stack));
-                if (stack.getItemDamage() < stack.getMaxDamage() * 0.5){
-                    WeaponNBT.setSharpnessLevel(stack, 5);
-                    //System.out.println("Sharpness = 5");
+                if(!stack.hasTagCompound()) {
+                    WeaponNBT.setDefaultNBT(stack);
                 }
-                if (stack.getItemDamage() > stack.getMaxDamage() * 0.5 && stack.getItemDamage() < stack.getMaxDamage() * 0.6){
-                    WeaponNBT.setSharpnessLevel(stack, 4);
-                    //System.out.println("Sharpness = 4");
-                }
-                if (stack.getItemDamage() > stack.getMaxDamage() * 0.6 && stack.getItemDamage() < stack.getMaxDamage() * 0.7){
-                    WeaponNBT.setSharpnessLevel(stack, 3);
-                    //System.out.println("Sharpness = 3");
-                }
-                if (stack.getItemDamage() > stack.getMaxDamage() * 0.7 && stack.getItemDamage() < stack.getMaxDamage() * 0.8){
-                    WeaponNBT.setSharpnessLevel(stack, 2);
-                    //System.out.println("Sharpness = 2");
-                }
-                if (stack.getItemDamage() > stack.getMaxDamage() * 0.8 && stack.getItemDamage() < stack.getMaxDamage() * 0.9){
-                    WeaponNBT.setSharpnessLevel(stack, 1);
-                    //System.out.println("Sharpness = 1");
-                }
-                if (stack.getItemDamage() > stack.getMaxDamage() * 0.9 && stack.getItemDamage() < stack.getMaxDamage()){
-                    WeaponNBT.setSharpnessLevel(stack, 0);
-                    //System.out.println("Sharpness = 0");
+                if(stack.hasTagCompound()) {
+                    if (stack.getItemDamage() < stack.getMaxDamage() * 0.5) {
+                        WeaponNBT.setSharpnessLevel(stack, 5);
+                        //System.out.println("Sharpness = 5");
+                    }
+                    if (stack.getItemDamage() > stack.getMaxDamage() * 0.5 && stack.getItemDamage() < stack.getMaxDamage() * 0.6) {
+                        WeaponNBT.setSharpnessLevel(stack, 4);
+                        //System.out.println("Sharpness = 4");
+                    }
+                    if (stack.getItemDamage() > stack.getMaxDamage() * 0.6 && stack.getItemDamage() < stack.getMaxDamage() * 0.7) {
+                        WeaponNBT.setSharpnessLevel(stack, 3);
+                        //System.out.println("Sharpness = 3");
+                    }
+                    if (stack.getItemDamage() > stack.getMaxDamage() * 0.7 && stack.getItemDamage() < stack.getMaxDamage() * 0.8) {
+                        WeaponNBT.setSharpnessLevel(stack, 2);
+                        //System.out.println("Sharpness = 2");
+                    }
+                    if (stack.getItemDamage() > stack.getMaxDamage() * 0.8 && stack.getItemDamage() < stack.getMaxDamage() * 0.9) {
+                        WeaponNBT.setSharpnessLevel(stack, 1);
+                        //System.out.println("Sharpness = 1");
+                    }
+                    if (stack.getItemDamage() > stack.getMaxDamage() * 0.9 && stack.getItemDamage() < stack.getMaxDamage()) {
+                        WeaponNBT.setSharpnessLevel(stack, 0);
+                        //System.out.println("Sharpness = 0");
+                    }
                 }
                 //System.out.println(WeaponNBT.getSharpnessLevel(stack));
             }
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java
index d7f4994f..c04f3028 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/SlayerSword.java
@@ -31,26 +31,32 @@ public class SlayerSword extends CustomSword {
 
         if(isSelected){
             EntityPlayer player = (EntityPlayer) ent;
+            if(!stack.hasTagCompound()) {
+                WeaponNBT.setDefaultNBT(stack);
+            }
+
             if(!player.inventory.offHandInventory.isEmpty()) {
                 ent.setSprinting(false);
             }
-            if (stack.getItemDamage() < stack.getMaxDamage() * 0.5){
-                WeaponNBT.setSharpnessLevel(stack, 5);
-            }
-            if (stack.getItemDamage() > stack.getMaxDamage() * 0.5 && stack.getItemDamage() < stack.getMaxDamage() * 0.6){
-                WeaponNBT.setSharpnessLevel(stack, 4);
-            }
-            if (stack.getItemDamage() > stack.getMaxDamage() * 0.6 && stack.getItemDamage() < stack.getMaxDamage() * 0.7){
-                WeaponNBT.setSharpnessLevel(stack, 3);
-            }
-            if (stack.getItemDamage() > stack.getMaxDamage() * 0.7 && stack.getItemDamage() < stack.getMaxDamage() * 0.8){
-                WeaponNBT.setSharpnessLevel(stack, 2);
-            }
-            if (stack.getItemDamage() > stack.getMaxDamage() * 0.8 && stack.getItemDamage() < stack.getMaxDamage() * 0.9){
-                WeaponNBT.setSharpnessLevel(stack, 1);
-            }
-            if (stack.getItemDamage() > stack.getMaxDamage() * 0.9 && stack.getItemDamage() < stack.getMaxDamage()){
-                WeaponNBT.setSharpnessLevel(stack, 0);
+            if(stack.hasTagCompound()) {
+                if (stack.getItemDamage() < stack.getMaxDamage() * 0.5) {
+                    WeaponNBT.setSharpnessLevel(stack, 5);
+                }
+                if (stack.getItemDamage() > stack.getMaxDamage() * 0.5 && stack.getItemDamage() < stack.getMaxDamage() * 0.6) {
+                    WeaponNBT.setSharpnessLevel(stack, 4);
+                }
+                if (stack.getItemDamage() > stack.getMaxDamage() * 0.6 && stack.getItemDamage() < stack.getMaxDamage() * 0.7) {
+                    WeaponNBT.setSharpnessLevel(stack, 3);
+                }
+                if (stack.getItemDamage() > stack.getMaxDamage() * 0.7 && stack.getItemDamage() < stack.getMaxDamage() * 0.8) {
+                    WeaponNBT.setSharpnessLevel(stack, 2);
+                }
+                if (stack.getItemDamage() > stack.getMaxDamage() * 0.8 && stack.getItemDamage() < stack.getMaxDamage() * 0.9) {
+                    WeaponNBT.setSharpnessLevel(stack, 1);
+                }
+                if (stack.getItemDamage() > stack.getMaxDamage() * 0.9 && stack.getItemDamage() < stack.getMaxDamage()) {
+                    WeaponNBT.setSharpnessLevel(stack, 0);
+                }
             }
         }
     }
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileWorkbenchRender.java b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileWorkbenchRender.java
index e6862199..92e2dfd2 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileWorkbenchRender.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileWorkbenchRender.java
@@ -14,6 +14,7 @@ import net.minecraft.util.math.BlockPos;
 import nmd.primal.core.common.helper.RecipeHelper;
 import nmd.primal.forgecraft.blocks.machine.Workbench;
 import nmd.primal.forgecraft.items.parts.WeaponPart;
+import nmd.primal.forgecraft.items.weapons.CustomSword;
 import nmd.primal.forgecraft.tiles.TileWorkbench;
 import org.lwjgl.opengl.GL11;
 
@@ -134,13 +135,15 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
                 }
                 if(!stack5.isEmpty()){
                     GL11.glPushMatrix();
-                    //System.out.println(stack2);
-                    //GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F);
-                    GL11.glTranslated(0.48D, 0.20625D, -0.15D);
-                    GL11.glScalef(1F, 1F, 1F);
+                    if(!(stack5.getItem() instanceof CustomSword)) {
+                        GL11.glTranslated(0.48D, 0.20625D, -0.15D);
+                        GL11.glScalef(1F, 1F, 1F);
+                    }
+                    if(stack5.getItem() instanceof CustomSword){
+                        GL11.glTranslated(0.2D, 0.42D, 0.075D);
+                        GL11.glScalef(0.5F, 0.5F, 0.5F);
+                    }
                     GL11.glRotated(-90.0F, 0.0F, 1.0F, 0.0F);
-                    //GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F);
-
                     renderItem.renderItem(stack5, ItemCameraTransforms.TransformType.HEAD);
                     GL11.glPopMatrix();
                 }
@@ -238,8 +241,16 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
                     GL11.glPushMatrix();
                     //System.out.println(stack2);
                     //GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F);
-                    GL11.glTranslated(0.52D, 0.20625D, 1.15D);
-                    GL11.glScalef(1F, 1F, 1F);
+
+                    if(!(stack5.getItem() instanceof CustomSword)) {
+                        GL11.glTranslated(0.52D, 0.20625D, 1.15D);
+                        GL11.glScalef(1F, 1F, 1F);
+                    }
+                    if(stack5.getItem() instanceof CustomSword){
+                        GL11.glTranslated(0.8D, 0.42D, 0.9D);
+                        GL11.glScalef(0.5F, 0.5F, 0.5F);
+                    }
+
                     GL11.glRotated(90.0F, 0.0F, 1.0F, 0.0F);
                     //GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F);
 
@@ -337,10 +348,15 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
                 }
                 if(!stack5.isEmpty()){
                     GL11.glPushMatrix();
-                    //System.out.println(stack2);
-                    //GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F);
-                    GL11.glTranslated(1.15D, 0.20625D, 0.485D);
-                    GL11.glScalef(1F, 1F, 1F);
+
+                    if(!(stack5.getItem() instanceof CustomSword)) {
+                        GL11.glTranslated(1.15D, 0.20625D, 0.485D);
+                        GL11.glScalef(1F, 1F, 1F);
+                    }
+                    if(stack5.getItem() instanceof CustomSword){
+                        GL11.glTranslated(0.91D, 0.42D, 0.235D);
+                        GL11.glScalef(0.5F, 0.5F, 0.5F);
+                    }
                     GL11.glRotated(180.0F, 0.0F, 1.0F, 0.0F);
                     //GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F);
 
@@ -434,12 +450,15 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
                 }
                 if(!stack5.isEmpty()){
                     GL11.glPushMatrix();
-                    //System.out.println(stack2);
-                    //GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F);
-                    GL11.glTranslated(-0.138D, 0.20625D, 0.52D);
-                    GL11.glScalef(1F, 1F, 1F);
-                    //GL11.glRotated(180.0F, 0.0F, 1.0F, 0.0F);
-                    //GL11.glRotated(-90.0F, 1.0F, 0.0F, 0.0F);
+
+                    if(!(stack5.getItem() instanceof CustomSword)) {
+                        GL11.glTranslated(-0.138D, 0.20625D, 0.52D);
+                        GL11.glScalef(1F, 1F, 1F);
+                    }
+                    if(stack5.getItem() instanceof CustomSword){
+                        GL11.glTranslated(0.095D, 0.42D, 0.8D);
+                        GL11.glScalef(0.5F, 0.5F, 0.5F);
+                    }
 
                     renderItem.renderItem(stack5, ItemCameraTransforms.TransformType.HEAD);
                     GL11.glPopMatrix();
diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/gladius_model.json b/kfc/src/main/resources/assets/forgecraft/models/item/gladius_model.json
index c1c536ff..38bfb090 100644
--- a/kfc/src/main/resources/assets/forgecraft/models/item/gladius_model.json
+++ b/kfc/src/main/resources/assets/forgecraft/models/item/gladius_model.json
@@ -1,9 +1,9 @@
 {
 	"__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
 	"textures": {
-		"particle": "items/finished_bronze",
-		"texture": "items/finished_bronze",
-		"handle": "blocks/planks_oak"
+		"particle": "forgecraft:items/finished_bronze",
+		"texture": "forgecraft:items/finished_bronze",
+		"handle": "forgecraft:blocks/planks_oak"
 	},
 	"elements": [ 	 
 		{
@@ -280,6 +280,10 @@
 			"translation":  [ -0.4, -0.4, 0 ],
 			"scale":  [ 0.5, 0.5, 0.5 ]
 		},
+		"head": {
+			"rotation":  [ -90, 0, 0 ],
+			"translation":  [ 5, 7.2, -9 ]
+		},
 		"ground": {
 			"rotation":  [ 90, 0, 0 ],
 			"scale":  [ 0.75, 0.75, 0.75 ]
diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/longsword_model.json b/kfc/src/main/resources/assets/forgecraft/models/item/longsword_model.json
index 39bc4604..f6b8ea09 100644
--- a/kfc/src/main/resources/assets/forgecraft/models/item/longsword_model.json
+++ b/kfc/src/main/resources/assets/forgecraft/models/item/longsword_model.json
@@ -256,6 +256,9 @@
 			"translation":  [ -0.7, -0.7, 4 ],
 			"scale":  [ 0.5, 0.5, 0.5 ]
 		},
+		"head": {
+			"translation":  [ 5.8, 14.75, -10.53 ]
+		},
 		"ground": {
 			"translation":  [ 0, 2, 0 ],
 			"scale":  [ 0.5, 0.5, 0.5 ]
diff --git a/kfc/src/main/resources/assets/forgecraft/models/item/slayer_model.json b/kfc/src/main/resources/assets/forgecraft/models/item/slayer_model.json
index a8e1d682..54e26405 100644
--- a/kfc/src/main/resources/assets/forgecraft/models/item/slayer_model.json
+++ b/kfc/src/main/resources/assets/forgecraft/models/item/slayer_model.json
@@ -319,6 +319,9 @@
 			"translation":  [ 0, -1.3, 0 ],
 			"scale":  [ 0.4, 0.4, 0.4 ]
 		},
+		"head": {
+			"translation":  [ 0.7, -0.9, -10 ]
+		},
 		"ground": {
 			"translation":  [ 0, -5, 0 ],
 			"scale":  [ 0.5, 0.5, 0.5 ]