diff --git a/packages/models/weapons/auto/tris_high.md3 b/packages/models/weapons/auto/tris_high.md3
index cd7b6415..c651150c 100644
Binary files a/packages/models/weapons/auto/tris_high.md3 and b/packages/models/weapons/auto/tris_high.md3 differ
diff --git a/packages/models/weapons/auto/tris_high.qc b/packages/models/weapons/auto/tris_high.qc
index b06faacd..f925877e 100644
--- a/packages/models/weapons/auto/tris_high.qc
+++ b/packages/models/weapons/auto/tris_high.qc
@@ -1,23 +1,23 @@
-// Quake III Arena MD3 control file, generated by MilkShape 3D
-//
-$model "models/players/model/model.md3"
-// reference frame
-//$frames -1 -1
-// frame 1-30
-$frames 1 30
-$flags 0
-$numskins 0
-
-// you can have one or no parent tag
-
-// tags
-
-// meshes (surfaces)
-$mesh "weapon"
-$skin "models/players/model/skin.tga"
-$flags 0
-
-$mesh "hands"
-$skin "models/players/model/skin.tga"
-$flags 0
-
+// Quake III Arena MD3 control file, generated by MilkShape 3D
+//
+$model "models/players/model/model.md3"
+// reference frame
+//$frames -1 -1
+// frame 1-30
+$frames 1 30
+$flags 0
+$numskins 0
+
+// you can have one or no parent tag
+
+// tags
+
+// meshes (surfaces)
+$mesh "hands"
+$skin "models/players/model/skin.tga"
+$flags 0
+
+$mesh "weapon"
+$skin "models/players/model/skin.tga"
+$flags 0
+
diff --git a/packages/sounds/sound_todo.txt b/packages/sounds/sound_todo.txt
index 67750bfc..fb6bc0a6 100644
--- a/packages/sounds/sound_todo.txt
+++ b/packages/sounds/sound_todo.txt
@@ -1,18 +1,18 @@
 Following sounds to be assigned:
 (also suggesting dir structure,adding "misc", "ctf")
 
-/weapon/clip_empty.wav
-/weapon/reload_pistol.wav
-/weapon/reload_shotgun.wav
-/weapon/reload_sub.wav
-/weapon/reload_sniper.wav
-/weapon/reload_auto.wav
-/weapon/grenade_pull.wav
+/weapon/clip_empty.wav        /sample exsists
+/weapon/reload_pistol.wav     /sample exsists
+/weapon/reload_shotgun.wav    /sample exsists
+/weapon/reload_sub.wav        /sample exsists
+/weapon/reload_sniper.wav     /sample exsists 
+/weapon/reload_auto.wav       /sample exsists
+/weapon/grenade_pull.wav      
 /weapon/grenade_throw.wav
-/weapon/grenade_bounce.wav
-/weapon/grenade_exp.wav
+/weapon/grenade_bounce.wav    
+/weapon/grenade_exp.wav       /sample exsists
 
-/player/footsteps.wav
+/player/footsteps.wav         /sample exsists
 /player/land_pain.wav
 
 /misc/menu_click1.wav OR menu_click2.wav
@@ -20,6 +20,7 @@ Following sounds to be assigned:
 /misc/pickup_clips.wav
 /misc/pickup_ammo.wav
 /misc/pickup_kevlar.wav
+/misc/change_gun.wav
 
 /ctf/flag_pickup.wav
 /ctf/flag_drop.wav
diff --git a/packages/sounds/weapon/auto_reload.wav b/packages/sounds/weapon/auto_reload.wav
new file mode 100644
index 00000000..ea05d7b3
Binary files /dev/null and b/packages/sounds/weapon/auto_reload.wav differ
diff --git a/packages/sounds/weapon/clip_empty.wav b/packages/sounds/weapon/clip_empty.wav
index 622d2142..d9ab1178 100644
Binary files a/packages/sounds/weapon/clip_empty.wav and b/packages/sounds/weapon/clip_empty.wav differ
diff --git a/packages/sounds/weapon/grenade_exp.wav b/packages/sounds/weapon/grenade_exp.wav
new file mode 100644
index 00000000..7a2bea8e
Binary files /dev/null and b/packages/sounds/weapon/grenade_exp.wav differ
diff --git a/packages/sounds/weapon/pistol_reload.wav b/packages/sounds/weapon/pistol_reload.wav
new file mode 100644
index 00000000..a2ad02b6
Binary files /dev/null and b/packages/sounds/weapon/pistol_reload.wav differ
diff --git a/packages/sounds/weapon/shotgun_reload.wav b/packages/sounds/weapon/shotgun_reload.wav
new file mode 100644
index 00000000..0c26bd7d
Binary files /dev/null and b/packages/sounds/weapon/shotgun_reload.wav differ
diff --git a/packages/sounds/weapon/sniper_reload.wav b/packages/sounds/weapon/sniper_reload.wav
new file mode 100644
index 00000000..e436fa82
Binary files /dev/null and b/packages/sounds/weapon/sniper_reload.wav differ
diff --git a/packages/sounds/weapon/sub.wav b/packages/sounds/weapon/sub.wav
index 870f70cc..1caf7266 100644
Binary files a/packages/sounds/weapon/sub.wav and b/packages/sounds/weapon/sub.wav differ
diff --git a/packages/sounds/weapon/sub_.wav b/packages/sounds/weapon/sub_.wav
new file mode 100644
index 00000000..870f70cc
Binary files /dev/null and b/packages/sounds/weapon/sub_.wav differ
diff --git a/packages/sounds/weapon/sub_reload.wav b/packages/sounds/weapon/sub_reload.wav
new file mode 100644
index 00000000..eda4d1a2
Binary files /dev/null and b/packages/sounds/weapon/sub_reload.wav differ