diff --git a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
index 4cfd08835..6dacf9b31 100644
--- a/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
+++ b/src/main/java/net/mcreator/superbwarfare/client/ClickHandler.java
@@ -181,23 +181,19 @@ public class ClickHandler {
                 if (key == ModKeyMappings.EDIT_SCOPE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_SCOPE)) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(0));
                     editModelShake();
-                }
-                if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_BARREL) && !player.isCrouching()) {
+                } else if (key == ModKeyMappings.EDIT_GRIP.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_GRIP)) {
+                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(4));
+                    editModelShake();
+                } else if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_BARREL)) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(1));
                     editModelShake();
-                }
-                if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_MAGAZINE)) {
+                } else if (key == ModKeyMappings.EDIT_MAGAZINE.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_MAGAZINE)) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(2));
                     editModelShake();
-                }
-                if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_STOCK)) {
+                } else if (key == ModKeyMappings.EDIT_STOCK.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_STOCK)) {
                     ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(3));
                     editModelShake();
                 }
-                if (key == ModKeyMappings.EDIT_BARREL.getKey().getValue() && stack.is(ModTags.Items.CAN_APPLY_GRIP) && player.isCrouching()) {
-                    ModUtils.PACKET_HANDLER.sendToServer(new EditMessage(4));
-                    editModelShake();
-                }
             }
             if (key == ModKeyMappings.SENSITIVITY_INCREASE.getKey().getValue()) {
                 ModUtils.PACKET_HANDLER.sendToServer(new SensitivityMessage(true));
diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
index d8e6b53b7..80217a76f 100644
--- a/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
+++ b/src/main/java/net/mcreator/superbwarfare/init/ModKeyMappings.java
@@ -76,8 +76,8 @@ public class ModKeyMappings {
     public static final KeyMapping EDIT_BARREL = new KeyMapping("key.superbwarfare.edit_barrel", GLFW.GLFW_KEY_LEFT, "key.categories.superbwarfare");
     public static final KeyMapping EDIT_MAGAZINE = new KeyMapping("key.superbwarfare.edit_magazine", GLFW.GLFW_KEY_DOWN, "key.categories.superbwarfare");
     public static final KeyMapping EDIT_STOCK = new KeyMapping("key.superbwarfare.edit_stock", GLFW.GLFW_KEY_RIGHT, "key.categories.superbwarfare");
-//    public static final KeyMapping EDIT_GRIP = new KeyMapping("key.superbwarfare.edit_grip", KeyConflictContext.IN_GAME,
-//            KeyModifier.SHIFT, InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_LEFT, "key.categories.superbwarfare");
+    public static final KeyMapping EDIT_GRIP = new KeyMapping("key.superbwarfare.edit_grip", KeyConflictContext.IN_GAME,
+            KeyModifier.SHIFT, InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_LEFT, "key.categories.superbwarfare");
 
     @SubscribeEvent
     public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
diff --git a/src/main/resources/assets/superbwarfare/geo/ak.geo.json b/src/main/resources/assets/superbwarfare/geo/ak.geo.json
index 6321d5a60..b1af012fb 100644
--- a/src/main/resources/assets/superbwarfare/geo/ak.geo.json
+++ b/src/main/resources/assets/superbwarfare/geo/ak.geo.json
@@ -39,6 +39,307 @@
 					"parent": "0",
 					"pivot": [0.5, 3.08594, -1.9]
 				},
+				{
+					"name": "Barrel1",
+					"parent": "Barrel",
+					"pivot": [0.5, 3.08594, -1.9]
+				},
+				{
+					"name": "group6",
+					"parent": "Barrel1",
+					"pivot": [0.5, 2.08594, -16.875],
+					"cubes": [
+						{
+							"origin": [0.3288, 1.67459, -17.21427],
+							"size": [0.34241, 0.8227, 0.57855],
+							"uv": {
+								"north": {"uv": [26, 90.25], "uv_size": [0.25, 0.75]},
+								"south": {"uv": [22, 91.25], "uv_size": [0.25, 0.75]},
+								"up": {"uv": [24, 92.25], "uv_size": [0.25, 0.5]},
+								"down": {"uv": [28, 88.75], "uv_size": [0.25, -0.5]}
+							}
+						},
+						{
+							"origin": [0.3288, 1.67459, -17.21427],
+							"size": [0.34241, 0.8227, 0.57855],
+							"pivot": [0.5, 2.08594, -18.96244],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [27, 86.25], "uv_size": [0.25, 0.75]},
+								"south": {"uv": [23, 91.25], "uv_size": [0.25, 0.75]},
+								"up": {"uv": [25, 92.25], "uv_size": [0.25, 0.5]},
+								"down": {"uv": [28, 89.75], "uv_size": [0.25, -0.5]}
+							}
+						},
+						{
+							"origin": [0.08865, 1.91473, -17.21427],
+							"size": [0.8227, 0.34241, 0.57855],
+							"uv": {
+								"north": {"uv": [27, 87.25], "uv_size": [0.75, 0.25]},
+								"east": {"uv": [26, 92.25], "uv_size": [0.5, 0.25]},
+								"south": {"uv": [24, 91.25], "uv_size": [0.75, 0.25]},
+								"west": {"uv": [28, 90.25], "uv_size": [0.5, 0.25]}
+							}
+						},
+						{
+							"origin": [0.08865, 1.91473, -17.21427],
+							"size": [0.8227, 0.34241, 0.57855],
+							"pivot": [0.5, 2.08594, -18.96244],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [27, 88.25], "uv_size": [0.75, 0.25]},
+								"east": {"uv": [27, 92.25], "uv_size": [0.5, 0.25]},
+								"south": {"uv": [25, 91.25], "uv_size": [0.75, 0.25]},
+								"west": {"uv": [28, 91.25], "uv_size": [0.5, 0.25]}
+							}
+						}
+					]
+				},
+				{
+					"name": "group7",
+					"parent": "Barrel1",
+					"pivot": [0.5, 2.08594, -17.11427],
+					"cubes": [
+						{
+							"origin": [0.36304, 1.75686, -18.11427],
+							"size": [0.27393, 0.65816, 0.9],
+							"uv": {
+								"north": {"uv": [27, 89.25], "uv_size": [0.25, 0.75]},
+								"south": {"uv": [26, 91.25], "uv_size": [0.25, 0.75]},
+								"up": {"uv": [24, 89.25], "uv_size": [0.25, 1]},
+								"down": {"uv": [25, 90.25], "uv_size": [0.25, -1]}
+							}
+						},
+						{
+							"origin": [0.36304, 1.75686, -18.11427],
+							"size": [0.27393, 0.65816, 0.9],
+							"pivot": [0.5, 2.08594, -18.59281],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [27, 90.25], "uv_size": [0.25, 0.75]},
+								"south": {"uv": [27, 91.25], "uv_size": [0.25, 0.75]},
+								"up": {"uv": [22, 90.25], "uv_size": [0.25, 1]},
+								"down": {"uv": [26, 88.25], "uv_size": [0.25, -1]}
+							}
+						},
+						{
+							"origin": [0.17092, 1.94897, -18.11427],
+							"size": [0.65816, 0.27393, 0.9],
+							"uv": {
+								"north": {"uv": [22, 92.25], "uv_size": [0.75, 0.25]},
+								"east": {"uv": [24, 90.25], "uv_size": [1, 0.25]},
+								"south": {"uv": [28, 86.25], "uv_size": [0.75, 0.25]},
+								"west": {"uv": [26, 88.25], "uv_size": [1, 0.25]}
+							}
+						},
+						{
+							"origin": [0.17092, 1.94897, -18.11427],
+							"size": [0.65816, 0.27393, 0.9],
+							"pivot": [0.5, 2.08594, -18.59281],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [23, 92.25], "uv_size": [0.75, 0.25]},
+								"east": {"uv": [25, 90.25], "uv_size": [1, 0.25]},
+								"south": {"uv": [28, 87.25], "uv_size": [0.75, 0.25]},
+								"west": {"uv": [26, 89.25], "uv_size": [1, 0.25]}
+							}
+						}
+					]
+				},
+				{
+					"name": "group8",
+					"parent": "Barrel1",
+					"pivot": [0.5, 2.08594, -17.11427],
+					"cubes": [
+						{
+							"origin": [0.17092, 1.94897, -18.66427],
+							"size": [0.1, 0.27393, 0.25],
+							"pivot": [0.5, 2.08594, -18.59281],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [30, 88.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [25, 94.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [30, 89.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [26, 94.25], "uv_size": [0.25, 0.25]}
+							}
+						},
+						{
+							"origin": [0.36304, 1.75686, -18.66427],
+							"size": [0.27393, 0.1, 0.25],
+							"pivot": [0.5, 2.08594, -18.59281],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [30, 86.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [23, 94.25], "uv_size": [0.25, 0.25]},
+								"up": {"uv": [30, 87.25], "uv_size": [0.25, 0.25]},
+								"down": {"uv": [24, 94.5], "uv_size": [0.25, -0.25]}
+							}
+						},
+						{
+							"origin": [0.17092, 1.94897, -18.66427],
+							"size": [0.1, 0.27393, 0.25],
+							"uv": {
+								"north": {"uv": [28, 93.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [29, 92.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [29, 93.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [22, 94.25], "uv_size": [0.25, 0.25]}
+							}
+						},
+						{
+							"origin": [0.36304, 2.31502, -18.66427],
+							"size": [0.27393, 0.1, 1.55],
+							"uv": {
+								"north": {"uv": [28, 92.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [22, 86.25], "uv_size": [1.5, 0.25]},
+								"west": {"uv": [22, 87.25], "uv_size": [1.5, 0.25]},
+								"up": {"uv": [22, 88.25], "uv_size": [0.25, 1.5]},
+								"down": {"uv": [24, 87.75], "uv_size": [0.25, -1.5]}
+							}
+						},
+						{
+							"origin": [0.36415, 1.7564, -18.66427],
+							"size": [0.27393, 0.1, 1.55],
+							"uv": {
+								"north": {"uv": [32, 89.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [23, 88.25], "uv_size": [1.5, 0.25]},
+								"west": {"uv": [25, 86.25], "uv_size": [1.5, 0.25]},
+								"up": {"uv": [23, 89.25], "uv_size": [0.25, 1.5]},
+								"down": {"uv": [25, 88.75], "uv_size": [0.25, -1.5]}
+							}
+						},
+						{
+							"origin": [0.36304, 2.31502, -18.66427],
+							"size": [0.27393, 0.1, 0.25],
+							"pivot": [0.5, 2.08594, -18.59281],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [22, 93.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [29, 86.25], "uv_size": [0.25, 0.25]},
+								"up": {"uv": [23, 93.25], "uv_size": [0.25, 0.25]},
+								"down": {"uv": [29, 87.5], "uv_size": [0.25, -0.25]}
+							}
+						},
+						{
+							"origin": [0.72908, 1.94897, -18.66427],
+							"size": [0.1, 0.27393, 0.25],
+							"uv": {
+								"north": {"uv": [24, 93.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [29, 88.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [25, 93.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [29, 89.25], "uv_size": [0.25, 0.25]}
+							}
+						},
+						{
+							"origin": [0.72908, 1.94897, -18.66427],
+							"size": [0.1, 0.27393, 0.25],
+							"pivot": [0.5, 2.08594, -18.59281],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [26, 93.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [29, 90.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [27, 93.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [29, 91.25], "uv_size": [0.25, 0.25]}
+							}
+						}
+					]
+				},
+				{
+					"name": "group9",
+					"parent": "Barrel1",
+					"pivot": [0.5, 2.08594, -17.11427],
+					"cubes": [
+						{
+							"origin": [0.26965, 1.99006, -18.91427],
+							"size": [0.07, 0.19175, 0.25],
+							"pivot": [0.5, 2.08594, -18.61425],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [30, 90.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [27, 94.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [30, 91.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [28, 94.25], "uv_size": [0.25, 0.25]}
+							}
+						},
+						{
+							"origin": [0.40413, 1.85558, -18.91427],
+							"size": [0.19175, 0.07, 0.25],
+							"uv": {
+								"north": {"uv": [30, 92.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [29, 94.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [30, 93.25], "uv_size": [0.25, 0.25]},
+								"up": {"uv": [30, 94.25], "uv_size": [0.25, 0.25]},
+								"down": {"uv": [22, 95.5], "uv_size": [0.25, -0.25]}
+							}
+						},
+						{
+							"origin": [0.40413, 1.85558, -18.91427],
+							"size": [0.19175, 0.07, 0.25],
+							"pivot": [0.5, 2.08594, -18.61425],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [31, 86.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [23, 95.25], "uv_size": [0.25, 0.25]},
+								"up": {"uv": [31, 87.25], "uv_size": [0.25, 0.25]},
+								"down": {"uv": [24, 95.5], "uv_size": [0.25, -0.25]}
+							}
+						},
+						{
+							"origin": [0.26965, 1.99006, -18.91427],
+							"size": [0.07, 0.19175, 0.25],
+							"uv": {
+								"north": {"uv": [31, 88.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [25, 95.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [31, 89.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [26, 95.25], "uv_size": [0.25, 0.25]}
+							}
+						},
+						{
+							"origin": [0.40413, 2.24629, -18.91427],
+							"size": [0.19175, 0.07, 0.25],
+							"uv": {
+								"north": {"uv": [31, 90.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [27, 95.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [31, 91.25], "uv_size": [0.25, 0.25]},
+								"up": {"uv": [28, 95.25], "uv_size": [0.25, 0.25]},
+								"down": {"uv": [31, 92.5], "uv_size": [0.25, -0.25]}
+							}
+						},
+						{
+							"origin": [0.40413, 2.24629, -18.91427],
+							"size": [0.19175, 0.07, 0.25],
+							"pivot": [0.5, 2.08594, -18.61425],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [29, 95.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [31, 93.25], "uv_size": [0.25, 0.25]},
+								"up": {"uv": [30, 95.25], "uv_size": [0.25, 0.25]},
+								"down": {"uv": [31, 94.5], "uv_size": [0.25, -0.25]}
+							}
+						},
+						{
+							"origin": [0.66035, 1.99006, -18.91427],
+							"size": [0.07, 0.19175, 0.25],
+							"uv": {
+								"north": {"uv": [31, 95.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [22, 96.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [32, 86.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [23, 96.25], "uv_size": [0.25, 0.25]}
+							}
+						},
+						{
+							"origin": [0.66035, 1.99006, -18.91427],
+							"size": [0.07, 0.19175, 0.25],
+							"pivot": [0.5, 2.08594, -18.61425],
+							"rotation": [0, 0, -45],
+							"uv": {
+								"north": {"uv": [32, 87.25], "uv_size": [0.25, 0.25]},
+								"east": {"uv": [24, 96.25], "uv_size": [0.25, 0.25]},
+								"south": {"uv": [32, 88.25], "uv_size": [0.25, 0.25]},
+								"west": {"uv": [25, 96.25], "uv_size": [0.25, 0.25]}
+							}
+						}
+					]
+				},
 				{
 					"name": "Barrel2",
 					"parent": "Barrel",
diff --git a/src/main/resources/assets/superbwarfare/textures/item/ak47.png b/src/main/resources/assets/superbwarfare/textures/item/ak47.png
index 1ad77aaac..51213f387 100644
Binary files a/src/main/resources/assets/superbwarfare/textures/item/ak47.png and b/src/main/resources/assets/superbwarfare/textures/item/ak47.png differ