diff --git a/assets/quaternius/weapons/p90.tres b/assets/quaternius/weapons/p90.tres
index cedc25b..afbf80d 100644
--- a/assets/quaternius/weapons/p90.tres
+++ b/assets/quaternius/weapons/p90.tres
@@ -7,9 +7,10 @@
 [resource]
 script = ExtResource("1")
 model = ExtResource("2")
+position = Vector3(0.35, -0.35, -0.4)
 crosshair = ExtResource("3")
 rotation = Vector3(0, 180, 0)
-muzzle_position = Vector3(0.1, -0.4, 1.5)
+muzzle_position = Vector3(0.05, -0.3, 0.8)
 cooldown = 0.08
 max_distance = 15
 damage = 18
diff --git a/assets/quaternius/weapons/p90.tscn b/assets/quaternius/weapons/p90.tscn
index be1c3aa..35dfa10 100644
--- a/assets/quaternius/weapons/p90.tscn
+++ b/assets/quaternius/weapons/p90.tscn
@@ -1,6 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://quaternius_p90_scene"]
+[gd_scene format=3]
 
-[ext_resource type="ArrayMesh" path="res://assets/quaternius/models/P90.obj" id="1"]
+[ext_resource type="PackedScene" path="res://assets/quaternius/models/P90.glb" id="1"]
 
-[node name="P90" type="MeshInstance3D"]
-mesh = ExtResource("1")
+[node name="P90" type="Node3D"]
+scale = Vector3(0.3, 0.3, 0.3)
+
+[node name="Model" parent="." instance=ExtResource("1")]
diff --git a/assets/quaternius/weapons/pistol.tres b/assets/quaternius/weapons/pistol.tres
index b16adb0..1b64cbd 100644
--- a/assets/quaternius/weapons/pistol.tres
+++ b/assets/quaternius/weapons/pistol.tres
@@ -7,9 +7,10 @@
 [resource]
 script = ExtResource("1")
 model = ExtResource("2")
+position = Vector3(0.45, -0.35, -0.5)
 crosshair = ExtResource("3")
 rotation = Vector3(0, 180, 0)
-muzzle_position = Vector3(0.1, -0.4, 1.5)
+muzzle_position = Vector3(0.08, -0.35, 1.2)
 cooldown = 0.3
 max_distance = 15
 damage = 25
diff --git a/assets/quaternius/weapons/pistol.tscn b/assets/quaternius/weapons/pistol.tscn
index e7978b4..f030993 100644
--- a/assets/quaternius/weapons/pistol.tscn
+++ b/assets/quaternius/weapons/pistol.tscn
@@ -1,5 +1,8 @@
 [gd_scene format=3]
-[ext_resource type="ArrayMesh" path="res://assets/quaternius/models/Pistol.obj" id="1"]
 
-[node name="Pistol" type="MeshInstance3D"]
-mesh = ExtResource("1")
+[ext_resource type="PackedScene" path="res://assets/quaternius/models/Pistol.glb" id="1"]
+
+[node name="Pistol" type="Node3D"]
+scale = Vector3(0.3, 0.3, 0.3)
+
+[node name="Model" parent="." instance=ExtResource("1")]
diff --git a/assets/quaternius/weapons/revolver.tres b/assets/quaternius/weapons/revolver.tres
index 5379368..202ecc3 100644
--- a/assets/quaternius/weapons/revolver.tres
+++ b/assets/quaternius/weapons/revolver.tres
@@ -7,9 +7,10 @@
 [resource]
 script = ExtResource("1")
 model = ExtResource("2")
+position = Vector3(0.5, -0.35, -0.5)
 crosshair = ExtResource("3")
 rotation = Vector3(0, 180, 0)
-muzzle_position = Vector3(0.1, -0.4, 1.5)
+muzzle_position = Vector3(0.1, -0.35, 1.2)
 cooldown = 0.6
 max_distance = 15
 damage = 50
diff --git a/assets/quaternius/weapons/revolver.tscn b/assets/quaternius/weapons/revolver.tscn
index 9657bb8..2364770 100644
--- a/assets/quaternius/weapons/revolver.tscn
+++ b/assets/quaternius/weapons/revolver.tscn
@@ -1,5 +1,8 @@
 [gd_scene format=3]
-[ext_resource type="ArrayMesh" path="res://assets/quaternius/models/Revolver.obj" id="1"]
 
-[node name="Revolver" type="MeshInstance3D"]
-mesh = ExtResource("1")
+[ext_resource type="PackedScene" path="res://assets/quaternius/models/Revolver.glb" id="1"]
+
+[node name="Revolver" type="Node3D"]
+scale = Vector3(0.3, 0.3, 0.3)
+
+[node name="Model" parent="." instance=ExtResource("1")]
diff --git a/assets/quaternius/weapons/rifle.tres b/assets/quaternius/weapons/rifle.tres
index 3d71efb..1208525 100644
--- a/assets/quaternius/weapons/rifle.tres
+++ b/assets/quaternius/weapons/rifle.tres
@@ -7,9 +7,10 @@
 [resource]
 script = ExtResource("1")
 model = ExtResource("2")
+position = Vector3(0.4, -0.35, -0.4)
 crosshair = ExtResource("3")
 rotation = Vector3(0, 180, 0)
-muzzle_position = Vector3(0.1, -0.4, 1.5)
+muzzle_position = Vector3(0.05, -0.3, 0.8)
 cooldown = 0.12
 max_distance = 15
 damage = 30
diff --git a/assets/quaternius/weapons/rifle.tscn b/assets/quaternius/weapons/rifle.tscn
index 72da2a6..5100a71 100644
--- a/assets/quaternius/weapons/rifle.tscn
+++ b/assets/quaternius/weapons/rifle.tscn
@@ -1,5 +1,8 @@
 [gd_scene format=3]
-[ext_resource type="ArrayMesh" path="res://assets/quaternius/models/Rifle.obj" id="1"]
 
-[node name="Rifle" type="MeshInstance3D"]
-mesh = ExtResource("1")
+[ext_resource type="PackedScene" path="res://assets/quaternius/models/Rifle.glb" id="1"]
+
+[node name="Rifle" type="Node3D"]
+scale = Vector3(0.3, 0.3, 0.3)
+
+[node name="Model" parent="." instance=ExtResource("1")]
diff --git a/assets/quaternius/weapons/shotgun.tres b/assets/quaternius/weapons/shotgun.tres
index a9f11eb..820ba22 100644
--- a/assets/quaternius/weapons/shotgun.tres
+++ b/assets/quaternius/weapons/shotgun.tres
@@ -7,9 +7,10 @@
 [resource]
 script = ExtResource("1")
 model = ExtResource("2")
+position = Vector3(0.4, -0.35, -0.4)
 crosshair = ExtResource("3")
 rotation = Vector3(0, 180, 0)
-muzzle_position = Vector3(0.1, -0.4, 1.5)
+muzzle_position = Vector3(0.05, -0.3, 0.8)
 cooldown = 0.8
 max_distance = 15
 damage = 20
diff --git a/assets/quaternius/weapons/shotgun.tscn b/assets/quaternius/weapons/shotgun.tscn
index edd6ccf..2941682 100644
--- a/assets/quaternius/weapons/shotgun.tscn
+++ b/assets/quaternius/weapons/shotgun.tscn
@@ -1,5 +1,8 @@
 [gd_scene format=3]
-[ext_resource type="ArrayMesh" path="res://assets/quaternius/models/Shotgun.obj" id="1"]
 
-[node name="Shotgun" type="MeshInstance3D"]
-mesh = ExtResource("1")
+[ext_resource type="PackedScene" path="res://assets/quaternius/models/Shotgun.glb" id="1"]
+
+[node name="Shotgun" type="Node3D"]
+scale = Vector3(0.3, 0.3, 0.3)
+
+[node name="Model" parent="." instance=ExtResource("1")]
diff --git a/assets/quaternius/weapons/sniperrifle.tres b/assets/quaternius/weapons/sniperrifle.tres
index 9a2e4f7..fe47ff0 100644
--- a/assets/quaternius/weapons/sniperrifle.tres
+++ b/assets/quaternius/weapons/sniperrifle.tres
@@ -7,9 +7,10 @@
 [resource]
 script = ExtResource("1")
 model = ExtResource("2")
+position = Vector3(0.45, -0.3, -0.3)
 crosshair = ExtResource("3")
 rotation = Vector3(0, 180, 0)
-muzzle_position = Vector3(0.1, -0.4, 1.5)
+muzzle_position = Vector3(0.05, -0.25, 0.8)
 cooldown = 1.2
 max_distance = 15
 damage = 90
diff --git a/assets/quaternius/weapons/sniperrifle.tscn b/assets/quaternius/weapons/sniperrifle.tscn
index 9bee30d..8bacd03 100644
--- a/assets/quaternius/weapons/sniperrifle.tscn
+++ b/assets/quaternius/weapons/sniperrifle.tscn
@@ -1,5 +1,8 @@
 [gd_scene format=3]
-[ext_resource type="ArrayMesh" path="res://assets/quaternius/models/SniperRifle.obj" id="1"]
 
-[node name="SniperRifle" type="MeshInstance3D"]
-mesh = ExtResource("1")
+[ext_resource type="PackedScene" path="res://assets/quaternius/models/SniperRifle.glb" id="1"]
+
+[node name="SniperRifle" type="Node3D"]
+scale = Vector3(0.3, 0.3, 0.3)
+
+[node name="Model" parent="." instance=ExtResource("1")]