diff --git a/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim b/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim
index 0c5c22d93..5ebfa5d23 100644
--- a/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim
+++ b/Assets/Animation/Augments/Lazur/Cannon_CannonAction.anim
@@ -11043,6 +11043,13 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0
+    functionName: PlayChargeUpSound
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 1.0333333
     functionName: ShootLazer
     data: 
diff --git a/Assets/Audio/Augments/DDR/DDR1.asset b/Assets/Audio/Augments/DDR/DDR1.asset
new file mode 100644
index 000000000..64f96e40b
--- /dev/null
+++ b/Assets/Audio/Augments/DDR/DDR1.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: DDR1
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 51b872a091093b54f8243e64e01dbe31, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.9164927
+    max: 1
diff --git a/Assets/Audio/Augments/DDR/DDR1.asset.meta b/Assets/Audio/Augments/DDR/DDR1.asset.meta
new file mode 100644
index 000000000..7dbb3d921
--- /dev/null
+++ b/Assets/Audio/Augments/DDR/DDR1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0f82dfee99461854abed4f8f809b8dfa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/DDR/DDR2.asset b/Assets/Audio/Augments/DDR/DDR2.asset
new file mode 100644
index 000000000..0117eee08
--- /dev/null
+++ b/Assets/Audio/Augments/DDR/DDR2.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: DDR2
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 9f81417eff9ee344f8cc9c8dc9173b9d, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.95128745
+    max: 1
diff --git a/Assets/Audio/Augments/DDR/DDR2.asset.meta b/Assets/Audio/Augments/DDR/DDR2.asset.meta
new file mode 100644
index 000000000..729c8d315
--- /dev/null
+++ b/Assets/Audio/Augments/DDR/DDR2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d2bbe3e6cdbd0d24b80b200989fbbb1a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/DDR/DDR3.asset b/Assets/Audio/Augments/DDR/DDR3.asset
new file mode 100644
index 000000000..536df419d
--- /dev/null
+++ b/Assets/Audio/Augments/DDR/DDR3.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: DDR3
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 33dba0147eb1738459b866ba836efc57, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.95824635
+    max: 1
diff --git a/Assets/Audio/Augments/DDR/DDR3.asset.meta b/Assets/Audio/Augments/DDR/DDR3.asset.meta
new file mode 100644
index 000000000..7db9ff228
--- /dev/null
+++ b/Assets/Audio/Augments/DDR/DDR3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa45fcf92439b684da520c9682e59d2a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/FireExtension/LighterFlick.asset b/Assets/Audio/Augments/FireExtension/LighterFlick.asset
new file mode 100644
index 000000000..13f569e5d
--- /dev/null
+++ b/Assets/Audio/Augments/FireExtension/LighterFlick.asset
@@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: LighterFlick
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: f9821d3790f5b9a459dccf3bbd826d79, type: 3}
+  - {fileID: 8300000, guid: 1db501fe17a07584aa6a11c3849936c5, type: 3}
+  - {fileID: 8300000, guid: 5652b5238ed02ec4bbf23700bafc59a1, type: 3}
+  semitoneRange:
+    min: 0
+    max: 1
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.9498957
+    max: 1
diff --git a/Assets/Audio/Augments/FireExtension/LighterFlick.asset.meta b/Assets/Audio/Augments/FireExtension/LighterFlick.asset.meta
new file mode 100644
index 000000000..a31f5bc93
--- /dev/null
+++ b/Assets/Audio/Augments/FireExtension/LighterFlick.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e00fd20c5a85e8d46be08afe2e4fe016
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Lazur/LazurCharge.asset b/Assets/Audio/Augments/Lazur/LazurCharge.asset
new file mode 100644
index 000000000..ba9579045
--- /dev/null
+++ b/Assets/Audio/Augments/Lazur/LazurCharge.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: LazurCharge
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 940cc35a43734eb4db7f712e55968558, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.93945724
+    max: 1
diff --git a/Assets/Audio/Augments/Lazur/LazurCharge.asset.meta b/Assets/Audio/Augments/Lazur/LazurCharge.asset.meta
new file mode 100644
index 000000000..f5960db8a
--- /dev/null
+++ b/Assets/Audio/Augments/Lazur/LazurCharge.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2d1e0be7e0af4344e9a3bbdc27606cdf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Lazur/Lazur.asset b/Assets/Audio/Augments/Lazur/LazurShot.asset
similarity index 90%
rename from Assets/Audio/Augments/Lazur/Lazur.asset
rename to Assets/Audio/Augments/Lazur/LazurShot.asset
index 7424d1ce1..d0d1c8d4b 100644
--- a/Assets/Audio/Augments/Lazur/Lazur.asset
+++ b/Assets/Audio/Augments/Lazur/LazurShot.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
-  m_Name: Lazur
+  m_Name: LazurShot
   m_EditorClassIdentifier: 
   sounds:
   - {fileID: 8300000, guid: ec7ffe33b221e3b4995342c65045f49d, type: 3}
@@ -19,5 +19,5 @@ MonoBehaviour:
     max: 0
   continuousPitchBend: 0
   volumeRange:
-    min: 0.27417034
-    max: 0.3174603
+    min: 0.36811608
+    max: 0.4009676
diff --git a/Assets/Audio/Augments/Lazur/Lazur.asset.meta b/Assets/Audio/Augments/Lazur/LazurShot.asset.meta
similarity index 100%
rename from Assets/Audio/Augments/Lazur/Lazur.asset.meta
rename to Assets/Audio/Augments/Lazur/LazurShot.asset.meta
diff --git a/Assets/Audio/Augments/Revolver/BonkStrong.asset b/Assets/Audio/Augments/Revolver/BonkStrong.asset
new file mode 100644
index 000000000..2e9227c2b
--- /dev/null
+++ b/Assets/Audio/Augments/Revolver/BonkStrong.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: BonkStrong
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: df0d1dd1be611d6479e633a92c8f8a91, type: 3}
+  semitoneRange:
+    min: -1
+    max: 0
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Revolver/BonkStrong.asset.meta b/Assets/Audio/Augments/Revolver/BonkStrong.asset.meta
new file mode 100644
index 000000000..829e1ee7b
--- /dev/null
+++ b/Assets/Audio/Augments/Revolver/BonkStrong.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 853a0ba196c8b5c4fb48ccc426a60990
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Revolver/bank-thud-04.mp3 b/Assets/Audio/Augments/Revolver/BonkStrong.mp3
similarity index 100%
rename from Assets/Audio/Augments/Revolver/bank-thud-04.mp3
rename to Assets/Audio/Augments/Revolver/BonkStrong.mp3
diff --git a/Assets/Audio/Augments/Revolver/bank-thud-04.mp3.meta b/Assets/Audio/Augments/Revolver/BonkStrong.mp3.meta
similarity index 100%
rename from Assets/Audio/Augments/Revolver/bank-thud-04.mp3.meta
rename to Assets/Audio/Augments/Revolver/BonkStrong.mp3.meta
diff --git a/Assets/Audio/Augments/Revolver/BonkWeak.asset b/Assets/Audio/Augments/Revolver/BonkWeak.asset
new file mode 100644
index 000000000..10398dfeb
--- /dev/null
+++ b/Assets/Audio/Augments/Revolver/BonkWeak.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: BonkWeak
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 4abfc03670db1b1478a1286f3b46099d, type: 3}
+  semitoneRange:
+    min: -1
+    max: 0
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Revolver/BonkWeak.asset.meta b/Assets/Audio/Augments/Revolver/BonkWeak.asset.meta
new file mode 100644
index 000000000..9c0c2c0ae
--- /dev/null
+++ b/Assets/Audio/Augments/Revolver/BonkWeak.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d7bc77e35e457f74a8ec062583ef335e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Revolver/bank-thud-05.mp3 b/Assets/Audio/Augments/Revolver/BonkWeak.mp3
similarity index 100%
rename from Assets/Audio/Augments/Revolver/bank-thud-05.mp3
rename to Assets/Audio/Augments/Revolver/BonkWeak.mp3
diff --git a/Assets/Audio/Augments/Revolver/bank-thud-05.mp3.meta b/Assets/Audio/Augments/Revolver/BonkWeak.mp3.meta
similarity index 100%
rename from Assets/Audio/Augments/Revolver/bank-thud-05.mp3.meta
rename to Assets/Audio/Augments/Revolver/BonkWeak.mp3.meta
diff --git a/Assets/Audio/Augments/Revolver/BulletsClinking.asset b/Assets/Audio/Augments/Revolver/BulletsClinking.asset
new file mode 100644
index 000000000..538a49a79
--- /dev/null
+++ b/Assets/Audio/Augments/Revolver/BulletsClinking.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: BulletsClinking
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 25d0c1347ce7114499a06bb027d4b96e, type: 3}
+  semitoneRange:
+    min: -1
+    max: 1
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Revolver/BulletsClinking.asset.meta b/Assets/Audio/Augments/Revolver/BulletsClinking.asset.meta
new file mode 100644
index 000000000..ffff9ede3
--- /dev/null
+++ b/Assets/Audio/Augments/Revolver/BulletsClinking.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6cb9aecceff300e4481c3c5b856f6217
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Revolver/Bullets klinking-10.mp3 b/Assets/Audio/Augments/Revolver/BulletsClinking.mp3
similarity index 100%
rename from Assets/Audio/Augments/Revolver/Bullets klinking-10.mp3
rename to Assets/Audio/Augments/Revolver/BulletsClinking.mp3
diff --git a/Assets/Audio/Augments/Revolver/Bullets klinking-10.mp3.meta b/Assets/Audio/Augments/Revolver/BulletsClinking.mp3.meta
similarity index 100%
rename from Assets/Audio/Augments/Revolver/Bullets klinking-10.mp3.meta
rename to Assets/Audio/Augments/Revolver/BulletsClinking.mp3.meta
diff --git a/Assets/Audio/Augments/Solar/SolarCharge.asset b/Assets/Audio/Augments/Solar/SolarCharge.asset
new file mode 100644
index 000000000..85822695e
--- /dev/null
+++ b/Assets/Audio/Augments/Solar/SolarCharge.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: SolarCharge
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 198b2c02124635d4c96cb46139054e46, type: 3}
+  semitoneRange:
+    min: 0
+    max: 1
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.93945724
+    max: 1
diff --git a/Assets/Audio/Augments/Solar/SolarCharge.asset.meta b/Assets/Audio/Augments/Solar/SolarCharge.asset.meta
new file mode 100644
index 000000000..619e662f1
--- /dev/null
+++ b/Assets/Audio/Augments/Solar/SolarCharge.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76631c2fa554819409c442c49bf2ef52
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Solar/solar-01.mp3 b/Assets/Audio/Augments/Solar/SolarCharge.mp3
similarity index 100%
rename from Assets/Audio/Augments/Solar/solar-01.mp3
rename to Assets/Audio/Augments/Solar/SolarCharge.mp3
diff --git a/Assets/Audio/Augments/Solar/solar-01.mp3.meta b/Assets/Audio/Augments/Solar/SolarCharge.mp3.meta
similarity index 100%
rename from Assets/Audio/Augments/Solar/solar-01.mp3.meta
rename to Assets/Audio/Augments/Solar/SolarCharge.mp3.meta
diff --git a/Assets/Audio/Augments/Solar/SolarDischarge.asset b/Assets/Audio/Augments/Solar/SolarDischarge.asset
new file mode 100644
index 000000000..1c647f635
--- /dev/null
+++ b/Assets/Audio/Augments/Solar/SolarDischarge.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: SolarDischarge
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: bfbd8cf5d07555c45af95f77b6804f37, type: 3}
+  semitoneRange:
+    min: 0
+    max: 1
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Solar/SolarDischarge.asset.meta b/Assets/Audio/Augments/Solar/SolarDischarge.asset.meta
new file mode 100644
index 000000000..e50996d68
--- /dev/null
+++ b/Assets/Audio/Augments/Solar/SolarDischarge.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4eeddff2ba2a9854ba0e05356f0867b7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Audio/Augments/Solar/solar-02.mp3 b/Assets/Audio/Augments/Solar/SolarDischarge.mp3
similarity index 100%
rename from Assets/Audio/Augments/Solar/solar-02.mp3
rename to Assets/Audio/Augments/Solar/SolarDischarge.mp3
diff --git a/Assets/Audio/Augments/Solar/solar-02.mp3.meta b/Assets/Audio/Augments/Solar/SolarDischarge.mp3.meta
similarity index 100%
rename from Assets/Audio/Augments/Solar/solar-02.mp3.meta
rename to Assets/Audio/Augments/Solar/SolarDischarge.mp3.meta
diff --git a/Assets/Audio/PlayerHit/Fire1.asset b/Assets/Audio/PlayerHit/BulletFire.asset
similarity index 89%
rename from Assets/Audio/PlayerHit/Fire1.asset
rename to Assets/Audio/PlayerHit/BulletFire.asset
index ba54a9ae4..402fdb412 100644
--- a/Assets/Audio/PlayerHit/Fire1.asset
+++ b/Assets/Audio/PlayerHit/BulletFire.asset
@@ -10,15 +10,17 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
-  m_Name: Fire1
+  m_Name: BulletFire
   m_EditorClassIdentifier: 
   sounds:
   - {fileID: 8300000, guid: bcf0df8ca3bb3c4449dbb2b8dc0f0a26, type: 3}
   - {fileID: 8300000, guid: 529a3f0d2d82dd5488a490c4fb6101eb, type: 3}
   - {fileID: 8300000, guid: 1cd10f3345bbad943996f7da5d429ecc, type: 3}
   semitoneRange:
-    min: 0
-    max: 0
+    min: -1
+    max: 1
+  continuousPitchBend: 1
   volumeRange:
     min: 1
     max: 1
+  is3D: 1
diff --git a/Assets/Audio/PlayerHit/Fire1.asset.meta b/Assets/Audio/PlayerHit/BulletFire.asset.meta
similarity index 100%
rename from Assets/Audio/PlayerHit/Fire1.asset.meta
rename to Assets/Audio/PlayerHit/BulletFire.asset.meta
diff --git a/Assets/Audio/PlayerHit/ScoreboardFire.asset b/Assets/Audio/PlayerHit/ScoreboardFire.asset
new file mode 100644
index 000000000..de9c3eab7
--- /dev/null
+++ b/Assets/Audio/PlayerHit/ScoreboardFire.asset
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: ScoreboardFire
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: bcf0df8ca3bb3c4449dbb2b8dc0f0a26, type: 3}
+  - {fileID: 8300000, guid: 529a3f0d2d82dd5488a490c4fb6101eb, type: 3}
+  - {fileID: 8300000, guid: 1cd10f3345bbad943996f7da5d429ecc, type: 3}
+  semitoneRange:
+    min: -1
+    max: 1
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.79123175
+    max: 0.79123175
+  is3D: 0
diff --git a/Assets/Audio/PlayerHit/ScoreboardFire.asset.meta b/Assets/Audio/PlayerHit/ScoreboardFire.asset.meta
new file mode 100644
index 000000000..ea7bea564
--- /dev/null
+++ b/Assets/Audio/PlayerHit/ScoreboardFire.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b85c2d27bf39bda4787e149b19385438
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/LazurController.cs b/Assets/LazurController.cs
index 71df9e96e..c97bf1de4 100644
--- a/Assets/LazurController.cs
+++ b/Assets/LazurController.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using UnityEngine;
 using UnityEngine.VFX;
+
 public class LazurController : ProjectileController
 {
     public VisualEffect Vfx;
@@ -17,11 +18,12 @@ public class LazurController : ProjectileController
     private ProjectileState projectile = new ProjectileState();
 
     [SerializeField]
-    private AugmentAnimator animator;
+    private LazurFiringAnimator animator;
 
     private AudioSource audioSource;
+
     [SerializeField]
-    private AudioClip chargeUpAudio;
+    private AudioGroup chargeUpAudio;
 
     protected override void Awake()
     {
@@ -30,14 +32,23 @@ protected override void Awake()
             return;
         audioSource = GetComponent<AudioSource>();
         animator.OnShotFiredAnimation += FireLazur;
+        animator.OnChargeStart += PlayChargeUpSound;
+    }
+
+    private void OnDestroy()
+    {
+        if (!gunController || !gunController.Player || !animator)
+            return;
+        animator.OnShotFiredAnimation -= FireLazur;
+        animator.OnChargeStart -= PlayChargeUpSound;
     }
 
-    void Start()
+    private void Start()
     {
         Vfx.SetGraphicsBuffer("StartEndPositions", encoder.StartEndPositionsBuffer);
     }
 
-    public void FireLazur()
+    private void FireLazur()
     {
         projectile = new()
         {
@@ -112,7 +123,12 @@ protected override void OnReload(GunStats stats)
     public override void InitializeProjectile(GunStats stats)
     {
         animator.OnFire(stats);
-        audioSource.clip = chargeUpAudio;
-        audioSource.Play();
+    }
+
+    private void PlayChargeUpSound()
+    {
+        if (!gunController)
+            return;
+        chargeUpAudio.Play(audioSource);
     }
 }
diff --git a/Assets/LazurFiringAnimator.cs b/Assets/LazurFiringAnimator.cs
index ae86e0e69..f5767444d 100644
--- a/Assets/LazurFiringAnimator.cs
+++ b/Assets/LazurFiringAnimator.cs
@@ -5,6 +5,8 @@ public class LazurFiringAnimator : AugmentAnimator
     [SerializeField]
     private Animator animator;
 
+    public AnimationEvent OnChargeStart;
+
     public override void OnInitialize(GunStats stats)
     {
         return;
@@ -15,6 +17,11 @@ public override void OnReload(GunStats stats)
         return;
     }
 
+    public void PlayChargeUpSound()
+    {
+        OnChargeStart?.Invoke();
+    }
+
     public void ShootLazer()
     {
         this.OnShotFiredAnimation?.Invoke();
diff --git a/Assets/Models/GunParts/lAZUR.fbx.meta b/Assets/Models/GunParts/lAZUR.fbx.meta
index 0a054ce3e..707a34e44 100644
--- a/Assets/Models/GunParts/lAZUR.fbx.meta
+++ b/Assets/Models/GunParts/lAZUR.fbx.meta
@@ -31,7 +31,43 @@ ModelImporter:
     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Cannon|CannonAction
+      takeName: Cannon|CannonAction
+      internalID: -6553991024997028326
+      firstFrame: 0
+      lastFrame: 79
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events:
+      - time: 0.05428788
+        functionName: PlayChargeUpSound
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 0
   meshes:
     lODScreenPercentages: []
diff --git a/Assets/Prefabs/ArenaCamera.prefab b/Assets/Prefabs/ArenaCamera.prefab
index 50fe081f9..e078744db 100644
--- a/Assets/Prefabs/ArenaCamera.prefab
+++ b/Assets/Prefabs/ArenaCamera.prefab
@@ -10,7 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4560627545820911483}
   - component: {fileID: 4560627545820911482}
-  - component: {fileID: 4560627545820911485}
   - component: {fileID: 4560627545820911480}
   m_Layer: 0
   m_Name: ArenaCamera
@@ -85,14 +84,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &4560627545820911485
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4560627545820911484}
-  m_Enabled: 1
 --- !u!114 &4560627545820911480
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/GunParts/BulletBarrel.prefab b/Assets/Prefabs/GunParts/BulletBarrel.prefab
index 3c5a17250..e3c574141 100644
--- a/Assets/Prefabs/GunParts/BulletBarrel.prefab
+++ b/Assets/Prefabs/GunParts/BulletBarrel.prefab
@@ -650,6 +650,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 20
@@ -677,7 +680,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67e1c2fae3becca4d88288bfa7bb3395, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 5765902433490691002}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -721,8 +729,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/Bullets/CannonExplosion.prefab b/Assets/Prefabs/GunParts/Bullets/CannonExplosion.prefab
index eb63d198d..c03876b5e 100644
--- a/Assets/Prefabs/GunParts/Bullets/CannonExplosion.prefab
+++ b/Assets/Prefabs/GunParts/Bullets/CannonExplosion.prefab
@@ -227,8 +227,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/Bullets/TrashUplink/FallingRock.prefab b/Assets/Prefabs/GunParts/Bullets/TrashUplink/FallingRock.prefab
index 747a4da48..0f9a2555d 100644
--- a/Assets/Prefabs/GunParts/Bullets/TrashUplink/FallingRock.prefab
+++ b/Assets/Prefabs/GunParts/Bullets/TrashUplink/FallingRock.prefab
@@ -49,7 +49,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   audibleVelocityThreshold: 20
   initialFallVelocity: 50
-  gravity: 9.81
   spherecastRadius: 1.46
   spherecastMask:
     serializedVersion: 2
@@ -103,8 +102,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 20
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/Bullets/TrashUplink/ImpactExplosion.prefab b/Assets/Prefabs/GunParts/Bullets/TrashUplink/ImpactExplosion.prefab
index 755f9848c..7ce7cd273 100644
--- a/Assets/Prefabs/GunParts/Bullets/TrashUplink/ImpactExplosion.prefab
+++ b/Assets/Prefabs/GunParts/Bullets/TrashUplink/ImpactExplosion.prefab
@@ -33,7 +33,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2954352013874095910
 MonoBehaviour:
@@ -227,8 +227,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/CannonBarrel.prefab b/Assets/Prefabs/GunParts/CannonBarrel.prefab
index 396341f4c..237068963 100644
--- a/Assets/Prefabs/GunParts/CannonBarrel.prefab
+++ b/Assets/Prefabs/GunParts/CannonBarrel.prefab
@@ -235,6 +235,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 40
@@ -266,7 +269,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: de5ab80858d9d8a40b4f1524fac3b820, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 0}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -340,8 +348,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/CoilBarrel.prefab b/Assets/Prefabs/GunParts/CoilBarrel.prefab
index 86f50266e..cf3f8c661 100644
--- a/Assets/Prefabs/GunParts/CoilBarrel.prefab
+++ b/Assets/Prefabs/GunParts/CoilBarrel.prefab
@@ -391,6 +391,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 25
@@ -422,7 +425,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67e1c2fae3becca4d88288bfa7bb3395, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 0}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -445,6 +453,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a8a5ed8580116e36d976d061ef0db232, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   interval: 0.15
   radius: 0.25
 --- !u!114 &7327065496144923300
@@ -480,8 +491,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/FireExtension.prefab b/Assets/Prefabs/GunParts/FireExtension.prefab
index 750a51a31..3d31a6833 100644
--- a/Assets/Prefabs/GunParts/FireExtension.prefab
+++ b/Assets/Prefabs/GunParts/FireExtension.prefab
@@ -199,6 +199,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d1c61eeba9689d747a445c9db14b8225, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers: []
   outputs:
   - {fileID: 1706792187696433307}
@@ -209,10 +212,7 @@ MonoBehaviour:
   trailLayers:
     serializedVersion: 2
     m_Bits: 8
-  lighterSounds:
-  - {fileID: 8300000, guid: f9821d3790f5b9a459dccf3bbd826d79, type: 3}
-  - {fileID: 8300000, guid: 1db501fe17a07584aa6a11c3849936c5, type: 3}
-  - {fileID: 8300000, guid: 5652b5238ed02ec4bbf23700bafc59a1, type: 3}
+  lighterSound: {fileID: 11400000, guid: e00fd20c5a85e8d46be08afe2e4fe016, type: 2}
   fireTrail: {fileID: 1119212264029477965}
   fireTrailInstances: {fileID: 1382308675925352878}
   positionActiveBuffer: {fileID: 1141831215458723034}
@@ -256,7 +256,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
+  MinDistance: 5
   MaxDistance: 500
   Pan2D: 0
   rolloffMode: 0
diff --git a/Assets/Prefabs/GunParts/HatBarrel.prefab b/Assets/Prefabs/GunParts/HatBarrel.prefab
index 6cce741cd..44813394b 100644
--- a/Assets/Prefabs/GunParts/HatBarrel.prefab
+++ b/Assets/Prefabs/GunParts/HatBarrel.prefab
@@ -469,6 +469,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileGravityModifier
     addition: 1
@@ -504,7 +507,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: de5ab80858d9d8a40b4f1524fac3b820, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 2006913084140856218}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -551,8 +559,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/LazurBarrel.prefab b/Assets/Prefabs/GunParts/LazurBarrel.prefab
index 7ec45843b..a2fa8bd89 100644
--- a/Assets/Prefabs/GunParts/LazurBarrel.prefab
+++ b/Assets/Prefabs/GunParts/LazurBarrel.prefab
@@ -557,6 +557,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 35
@@ -613,7 +616,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7836167e4b7873a4283f3dd70e4e68a1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 0}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -623,7 +631,7 @@ MonoBehaviour:
   MaxDistance: 180
   maxCollisions: 10
   animator: {fileID: 6370805171588257480}
-  chargeUpAudio: {fileID: 8300000, guid: 940cc35a43734eb4db7f712e55968558, type: 3}
+  chargeUpAudio: {fileID: 11400000, guid: 2d1e0be7e0af4344e9a3bbdc27606cdf, type: 2}
 --- !u!114 &4536155953706137537
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -678,7 +686,7 @@ AudioSource:
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
-  m_audioClip: {fileID: 8300000, guid: ec7ffe33b221e3b4995342c65045f49d, type: 3}
+  m_audioClip: {fileID: 0}
   m_PlayOnAwake: 0
   m_Volume: 1
   m_Pitch: 1
@@ -688,8 +696,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/RevolverBody.prefab b/Assets/Prefabs/GunParts/RevolverBody.prefab
index f674583c7..0a3f3bd97 100644
--- a/Assets/Prefabs/GunParts/RevolverBody.prefab
+++ b/Assets/Prefabs/GunParts/RevolverBody.prefab
@@ -5379,9 +5379,9 @@ MonoBehaviour:
   steamParticles: {fileID: 5463634872343731136}
   playerHandLeft: {fileID: 527560729399896272}
   playerHandRight: {fileID: 9100415052886736855}
-  bonkWeak: {fileID: 8300000, guid: 4abfc03670db1b1478a1286f3b46099d, type: 3}
-  bonkStrong: {fileID: 8300000, guid: df0d1dd1be611d6479e633a92c8f8a91, type: 3}
-  bulletDrop: {fileID: 8300000, guid: 25d0c1347ce7114499a06bb027d4b96e, type: 3}
+  bonkWeak: {fileID: 11400000, guid: d7bc77e35e457f74a8ec062583ef335e, type: 2}
+  bonkStrong: {fileID: 11400000, guid: 853a0ba196c8b5c4fb48ccc426a60990, type: 2}
+  bulletDrop: {fileID: 11400000, guid: 6cb9aecceff300e4481c3c5b856f6217, type: 2}
 --- !u!95 &5886082362856684746
 Animator:
   serializedVersion: 5
@@ -5456,8 +5456,17 @@ AudioSource:
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 1
-      value: 0
+      time: 0.6812817
+      value: 0.6667197
+      inSlope: -1.4309933
+      outSlope: -1.4309933
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.9961853
+      value: 0.011230469
       inSlope: 0
       outSlope: 0
       tangentMode: 0
diff --git a/Assets/Prefabs/GunParts/ShotgunBarrel.prefab b/Assets/Prefabs/GunParts/ShotgunBarrel.prefab
index f70b10e48..3c5f75045 100644
--- a/Assets/Prefabs/GunParts/ShotgunBarrel.prefab
+++ b/Assets/Prefabs/GunParts/ShotgunBarrel.prefab
@@ -730,6 +730,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: Firerate
     addition: 0
@@ -773,7 +776,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67e1c2fae3becca4d88288bfa7bb3395, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 5765902433490691002}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -817,8 +825,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/GunParts/SodiePopperBody.prefab b/Assets/Prefabs/GunParts/SodiePopperBody.prefab
index f81204687..39dd3b4ac 100644
--- a/Assets/Prefabs/GunParts/SodiePopperBody.prefab
+++ b/Assets/Prefabs/GunParts/SodiePopperBody.prefab
@@ -1169,7 +1169,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
+  MinDistance: 5
   MaxDistance: 500
   Pan2D: 0
   rolloffMode: 0
diff --git a/Assets/Prefabs/GunParts/SolarBody.prefab b/Assets/Prefabs/GunParts/SolarBody.prefab
index 21befcd40..7c1102811 100644
--- a/Assets/Prefabs/GunParts/SolarBody.prefab
+++ b/Assets/Prefabs/GunParts/SolarBody.prefab
@@ -123,8 +123,8 @@ MonoBehaviour:
   playerHandRight: {fileID: 8921753749033324608}
   playerHandLeft: {fileID: 3255742889843525835}
   reloadEfficiencyPercentagen: 0.25
-  chargeUp: {fileID: 8300000, guid: 198b2c02124635d4c96cb46139054e46, type: 3}
-  chargeDown: {fileID: 8300000, guid: bfbd8cf5d07555c45af95f77b6804f37, type: 3}
+  chargeUp: {fileID: 11400000, guid: 76631c2fa554819409c442c49bf2ef52, type: 2}
+  chargeDown: {fileID: 11400000, guid: 4eeddff2ba2a9854ba0e05356f0867b7, type: 2}
 --- !u!82 &2416882217755949969
 AudioSource:
   m_ObjectHideFlags: 0
@@ -145,7 +145,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
+  MinDistance: 5
   MaxDistance: 500
   Pan2D: 0
   rolloffMode: 0
diff --git a/Assets/Prefabs/GunParts/ddrBody.prefab b/Assets/Prefabs/GunParts/ddrBody.prefab
index 27a70bf72..08abbe348 100644
--- a/Assets/Prefabs/GunParts/ddrBody.prefab
+++ b/Assets/Prefabs/GunParts/ddrBody.prefab
@@ -75,7 +75,7 @@ GameObject:
   - component: {fileID: 8408495752136392818}
   - component: {fileID: 8367018402671598818}
   m_Layer: 0
-  m_Name: ddrBody
+  m_Name: DDRBody
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -125,17 +125,17 @@ MonoBehaviour:
     text: Excellent
     color: {r: 0.88235295, g: 0, b: 1, a: 1}
     awardFactor: 1
-    audio: {fileID: 8300000, guid: 33dba0147eb1738459b866ba836efc57, type: 3}
+    audio: {fileID: 11400000, guid: fa45fcf92439b684da520c9682e59d2a, type: 2}
   - range: 0.1
     text: Great
     color: {r: 1, g: 0.9490196, b: 0, a: 1}
     awardFactor: 0.75
-    audio: {fileID: 8300000, guid: 9f81417eff9ee344f8cc9c8dc9173b9d, type: 3}
+    audio: {fileID: 11400000, guid: d2bbe3e6cdbd0d24b80b200989fbbb1a, type: 2}
   - range: 0.25
     text: Good
     color: {r: 0, g: 1, b: 0.8509804, a: 1}
     awardFactor: 0.5
-    audio: {fileID: 8300000, guid: 51b872a091093b54f8243e64e01dbe31, type: 3}
+    audio: {fileID: 11400000, guid: 0f82dfee99461854abed4f8f809b8dfa, type: 2}
   - range: 0.5
     text: Meh
     color: {r: 0, g: 0.5137255, b: 1, a: 1}
@@ -153,7 +153,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 0
-  m_Volume: 0.16
+  m_Volume: 1
   m_Pitch: 1
   Loop: 0
   Mute: 0
@@ -161,7 +161,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
+  MinDistance: 5
   MaxDistance: 500
   Pan2D: 0
   rolloffMode: 0
diff --git a/Assets/Prefabs/Input/Player.prefab b/Assets/Prefabs/Input/Player.prefab
index f1fac3b89..0c2d4cc71 100644
--- a/Assets/Prefabs/Input/Player.prefab
+++ b/Assets/Prefabs/Input/Player.prefab
@@ -310,7 +310,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
+  MinDistance: 20
   MaxDistance: 500
   Pan2D: 0
   rolloffMode: 0
diff --git a/Assets/Prefabs/Input/PlayerInput.prefab b/Assets/Prefabs/Input/PlayerInput.prefab
index bb59b5718..f2ae13f25 100644
--- a/Assets/Prefabs/Input/PlayerInput.prefab
+++ b/Assets/Prefabs/Input/PlayerInput.prefab
@@ -83,6 +83,7 @@ MonoBehaviour:
   gamepadLookScale: 1.2
   playerCamera: {fileID: 3159361938328573030}
   ZoomActive: 0
+  CrouchActive: 0
 --- !u!114 &8900440296297243362
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -101,7 +102,7 @@ MonoBehaviour:
   body: {fileID: 0}
   barrel: {fileID: 0}
   extension: {fileID: 0}
-  bounty: 5
+  id: 0
 --- !u!1 &4578288573561392664
 GameObject:
   m_ObjectHideFlags: 0
@@ -163,6 +164,7 @@ GameObject:
   - component: {fileID: 5385955070489759476}
   - component: {fileID: 3159361938328573030}
   - component: {fileID: 2195640781203763389}
+  - component: {fileID: 2532746679402765580}
   m_Layer: 0
   m_Name: Camera
   m_TagString: Untagged
@@ -279,3 +281,11 @@ MonoBehaviour:
     mipBias: 0
     varianceClampScale: 0.9
     contrastAdaptiveSharpening: 0
+--- !u!81 &2532746679402765580
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8602880480366401748}
+  m_Enabled: 1
diff --git a/Assets/Prefabs/Interactables/CollectableAmmo.prefab b/Assets/Prefabs/Interactables/CollectableAmmo.prefab
index ac24a1225..dc94246b3 100644
--- a/Assets/Prefabs/Interactables/CollectableAmmo.prefab
+++ b/Assets/Prefabs/Interactables/CollectableAmmo.prefab
@@ -162,7 +162,6 @@ MonoBehaviour:
   respawnTime: 30
   boxModel: {fileID: 1985623613374479632}
   effect: {fileID: 4626888416364659096}
-  shouldAlwaysSpawn: 0
   soundEffect: {fileID: 11400000, guid: c4282c6a3bd9f0947977215c63820605, type: 2}
 --- !u!65 &3619325317696844035
 BoxCollider:
@@ -232,7 +231,7 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
+  MinDistance: 5
   MaxDistance: 500
   Pan2D: 0
   rolloffMode: 0
diff --git a/Assets/Prefabs/Interactables/CollectableChip.prefab b/Assets/Prefabs/Interactables/CollectableChip.prefab
index f64b34fcd..31ade4557 100644
--- a/Assets/Prefabs/Interactables/CollectableChip.prefab
+++ b/Assets/Prefabs/Interactables/CollectableChip.prefab
@@ -202,8 +202,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 5
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
diff --git a/Assets/Prefabs/Interactables/ExplodingBarrel.prefab b/Assets/Prefabs/Interactables/ExplodingBarrel.prefab
index 284fad19a..82303cecd 100644
--- a/Assets/Prefabs/Interactables/ExplodingBarrel.prefab
+++ b/Assets/Prefabs/Interactables/ExplodingBarrel.prefab
@@ -371,8 +371,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0
@@ -391,14 +391,23 @@ AudioSource:
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
+      time: 0.6217455
+      value: 0.6071954
+      inSlope: -1.4602448
+      outSlope: -1.4602448
       tangentMode: 0
       weightedMode: 0
       inWeight: 0.33333334
       outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.9885864
+      value: 0.19081116
+      inSlope: -0.051758796
+      outSlope: -0.051758796
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 1
+      outWeight: 0.33333334
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
diff --git a/Assets/Prefabs/UI/Scoreboards.prefab b/Assets/Prefabs/UI/Scoreboards.prefab
index 96e38659a..a5e9ea8a2 100644
--- a/Assets/Prefabs/UI/Scoreboards.prefab
+++ b/Assets/Prefabs/UI/Scoreboards.prefab
@@ -73,10 +73,9 @@ MonoBehaviour:
   - FOR USING THE CURIOUSLY RECURRING TEMPLATE PATTERN
   - FOR APPLYING KERNEL IN THE WRONG NEIGHBOURHOOD
   - FOR SELECT * FROM Users; DROP TABLE
-  nextCrimeSound: {fileID: 8300000, guid: 529a3f0d2d82dd5488a490c4fb6101eb, type: 3}
+  nextCrimeSound: {fileID: 11400000, guid: b85c2d27bf39bda4787e149b19385438, type: 2}
   newCrimeDelay: 1
-  delayBeforeMatchResults: 3
-  scoreboard: {fileID: 3999527489248871726, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+  matchProgressDelay: 5
 --- !u!82 &6776123763901425507
 AudioSource:
   m_ObjectHideFlags: 0
@@ -245,6 +244,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3999527489248871726, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
       propertyPath: m_Name
       value: Scoreboard
@@ -411,6 +430,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3999527489248871726, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
       propertyPath: m_Name
       value: Scoreboard (3)
@@ -577,6 +616,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3999527489248871726, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
       propertyPath: m_Name
       value: Scoreboard (1)
@@ -743,6 +802,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3081806687687265508, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3999527489248871726, guid: 8b23f31881c78374ab1508edbe40cdf6, type: 3}
       propertyPath: m_Name
       value: Scoreboard (2)
diff --git a/Assets/Scenes/TrainingMode.unity b/Assets/Scenes/TrainingMode.unity
index d75dbc329..3958956be 100644
--- a/Assets/Scenes/TrainingMode.unity
+++ b/Assets/Scenes/TrainingMode.unity
@@ -4757,7 +4757,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1633514220}
   - component: {fileID: 1633514219}
-  - component: {fileID: 1633514218}
   - component: {fileID: 1633514221}
   m_Layer: 0
   m_Name: Main Camera
@@ -4766,14 +4765,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!81 &1633514218
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1633514217}
-  m_Enabled: 1
 --- !u!20 &1633514219
 Camera:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Audio/AudioGroup.cs b/Assets/Scripts/Audio/AudioGroup.cs
index eacbbc063..962dbd9d8 100644
--- a/Assets/Scripts/Audio/AudioGroup.cs
+++ b/Assets/Scripts/Audio/AudioGroup.cs
@@ -2,6 +2,7 @@
 using CollectionExtensions;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.Serialization;
 
 [CreateAssetMenu(fileName = "AudioGroup", menuName = "Audio/New Audio Group")]
 public class AudioGroup : ScriptableObject
@@ -26,6 +27,9 @@ public class AudioGroup : ScriptableObject
     [SerializeField]
     private FloatRange volumeRange;
 
+    [SerializeField]
+    private bool is3D = true;
+
     private void Modulate(AudioSource source)
     {
         // Range has override for ints, so we need to force the endpoints to be floats in order to achieve a continuous scale.
@@ -36,9 +40,11 @@ private void Modulate(AudioSource source)
         // Use 3D sound if there's only one local player,
         // otherwise we're in splitscreen and should not spatialize sounds.
         var isOnlyOneLocalPlayer = PlayerInputManagerController.Singleton.LocalPlayerInputs.Count == 1;
-        // TODO replace this check!
-        var isInArena = Scenes.NotArenaScenes.Contains(SceneManager.GetActiveScene().name);
-        source.spatialBlend = isOnlyOneLocalPlayer && isInArena ? 0 : 1;
+        // TODO replace this check?
+        var isInArena = !Scenes.NotArenaScenes.Contains(SceneManager.GetActiveScene().name);
+        source.spatialBlend = is3D && isOnlyOneLocalPlayer && isInArena ? 1 : 0;
+        // Disable doppler effect as it sounds *very* weird
+        source.dopplerLevel = 0;
     }
 
     public void Play(AudioSource source)
@@ -46,6 +52,13 @@ public void Play(AudioSource source)
         Modulate(source);
         source.PlayOneShot(sounds.RandomElement());
     }
+    
+    public void PlayExclusively(AudioSource source)
+    {
+        Modulate(source);
+        source.clip = sounds.RandomElement();
+        source.Play();
+    }
 
     public void PlayDelayed(AudioSource source, float delay)
     {
diff --git a/Assets/Scripts/Augment/AugmentImplementations/DDRBody.cs b/Assets/Scripts/Augment/AugmentImplementations/DDRBody.cs
index 3fc8e1ee2..33b3d6262 100644
--- a/Assets/Scripts/Augment/AugmentImplementations/DDRBody.cs
+++ b/Assets/Scripts/Augment/AugmentImplementations/DDRBody.cs
@@ -9,7 +9,7 @@ public struct Precision
     public string text;
     public Color color;
     public float awardFactor;
-    public AudioClip audio;
+    public AudioGroup audio;
 }
 public enum ArrowDirection
 {
@@ -140,8 +140,7 @@ protected override void Reload(GunStats stats)
 
         if (precision.Value.audio)
         {
-            audioSource.clip = precision.Value.audio;
-            audioSource.Play();
+            precision.Value.audio.Play(audioSource);
         }
     }
 
diff --git a/Assets/Scripts/Augment/AugmentImplementations/Fire.cs b/Assets/Scripts/Augment/AugmentImplementations/Fire.cs
index 8673d6ab9..50695eb98 100644
--- a/Assets/Scripts/Augment/AugmentImplementations/Fire.cs
+++ b/Assets/Scripts/Augment/AugmentImplementations/Fire.cs
@@ -1,7 +1,7 @@
-using CollectionExtensions;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Serialization;
 using UnityEngine.VFX;
 
 public enum ProjectileType
@@ -22,7 +22,7 @@ public class Fire : GunExtension
     private GunController gunController;
     private AudioSource audioSource;
     [SerializeField]
-    private AudioClip[] lighterSounds;
+    private AudioGroup lighterSound;
     private ProjectileType projectileType = ProjectileType.Hitscan;
     [Header("HitscanProjectiles")]
     [SerializeField]
@@ -178,8 +178,7 @@ private void PlayShotAudio(GunStats stats)
     {
         if (!gunController || !audioSource)
             return;
-        audioSource.clip = lighterSounds.RandomElement();
-        audioSource.Play();
+        lighterSound.Play(audioSource);
     }
 
 #if UNITY_EDITOR
diff --git a/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs b/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
index 249291736..b3654c3f0 100644
--- a/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
+++ b/Assets/Scripts/Augment/AugmentImplementations/Revolver.cs
@@ -12,11 +12,11 @@ public class Revolver : GunBody
     private PlayerHand playerHandRight;
     private AudioSource audioSource;
     [SerializeField]
-    private AudioClip bonkWeak;
+    private AudioGroup bonkWeak;
     [SerializeField]
-    private AudioClip bonkStrong;
+    private AudioGroup bonkStrong;
     [SerializeField]
-    private AudioClip bulletDrop;
+    private AudioGroup bulletDrop;
 
     private GunBarrel barrel;
     private GunExtension extension;
@@ -63,22 +63,19 @@ public void PlayWeakBonk()
     {
         if (!gunController)
             return;
-        audioSource.clip = bonkWeak;
-        audioSource.Play();
+        bonkWeak.Play(audioSource);
     }
     public void PlayStrongBonk()
     {
         if (!gunController)
             return;
-        audioSource.clip = bonkStrong;
-        audioSource.Play();
+        bonkStrong.Play(audioSource);
     }
     public void PlayBulletDrop()
     {
         if (!gunController)
             return;
-        audioSource.clip = bulletDrop;
-        audioSource.Play();
+        bulletDrop.Play(audioSource);
     }
 
     public void ToggleArm()
diff --git a/Assets/Scripts/Augment/AugmentImplementations/Solar/SolarBody.cs b/Assets/Scripts/Augment/AugmentImplementations/Solar/SolarBody.cs
index eb80e79e5..f5bf30e46 100644
--- a/Assets/Scripts/Augment/AugmentImplementations/Solar/SolarBody.cs
+++ b/Assets/Scripts/Augment/AugmentImplementations/Solar/SolarBody.cs
@@ -35,9 +35,9 @@ public class SolarBody : GunBody
 
     private AudioSource audioSource;
     [SerializeField]
-    private AudioClip chargeUp;
+    private AudioGroup chargeUp;
     [SerializeField]
-    private AudioClip chargeDown;
+    private AudioGroup chargeDown;
 
     public override void Start()
     {
@@ -69,8 +69,7 @@ protected override void Reload(GunStats gunStats)
             LeanTween.value(gameObject, SetEmissionStrength, 0, 1, chargeUpSeconds);
             if (audioSource)
             {
-                audioSource.clip = chargeUp;
-                audioSource.Play();
+                chargeUp.Play(audioSource);
             }
         }
         solarPanelMaterial.SetFloat("_On", 1);
@@ -103,8 +102,7 @@ private void FixedUpdate()
         {
             if (audioSource && solarPanelMaterial.GetFloat("_On") == 1)
             {
-                audioSource.clip = chargeDown;
-                audioSource.Play();
+                chargeDown.Play(audioSource);
             }
             SetEmissionStrength(0);
             solarPanelMaterial.SetFloat("_On", 0);
diff --git a/Assets/Scripts/Augment/BulletModifiers/ZigzagPathModifier.cs b/Assets/Scripts/Augment/BulletModifiers/ZigzagPathModifier.cs
index 12931c654..90119f725 100644
--- a/Assets/Scripts/Augment/BulletModifiers/ZigzagPathModifier.cs
+++ b/Assets/Scripts/Augment/BulletModifiers/ZigzagPathModifier.cs
@@ -20,7 +20,7 @@ public class ZigzagPathModifier : NetworkBehaviour, ProjectileModifier
 
     private void Start()
     {
-        if (isServer)
+        if (isNetworked && isServer)
             RpcSeedRandom(random.Next());
     }
 
diff --git a/Assets/Scripts/Control&Input/Peer2PeerTransport.cs b/Assets/Scripts/Control&Input/Peer2PeerTransport.cs
index 21589a82c..d897fe156 100644
--- a/Assets/Scripts/Control&Input/Peer2PeerTransport.cs
+++ b/Assets/Scripts/Control&Input/Peer2PeerTransport.cs
@@ -311,9 +311,9 @@ private static IEnumerator WaitAndSwitchToTrainingMode()
         // Wait for player details to be populated
         while (!NetworkClient.isConnected && !singleton.isNetworkActive && players.Count < PlayerInputManagerController.Singleton.LocalPlayerInputs.Count)
             yield return new WaitForEndOfFrame();
-        singleton.ServerChangeScene(Scenes.TrainingMode);
 
         yield return new WaitForSeconds(LoadingScreen.Singleton.MandatoryDuration);
+        singleton.ServerChangeScene(Scenes.TrainingMode);
 
         // Wait for player(s) to have spawned
         // TODO add a timeout for these wait-for-spawn spins
diff --git a/Assets/Scripts/Scoreboard/ScoreboardManager.cs b/Assets/Scripts/Scoreboard/ScoreboardManager.cs
index 1767499bf..932295fe9 100644
--- a/Assets/Scripts/Scoreboard/ScoreboardManager.cs
+++ b/Assets/Scripts/Scoreboard/ScoreboardManager.cs
@@ -21,7 +21,7 @@ public class ScoreboardManager : MonoBehaviour
     public List<string> wantedSubtitles = new();
 
     [SerializeField]
-    private AudioClip nextCrimeSound;
+    private AudioGroup nextCrimeSound;
 
     private AudioSource audioSource;
 
@@ -129,7 +129,7 @@ private IEnumerator NextCrime()
     {
         if (step < maxSteps)
         {
-            audioSource.PlayOneShot(nextCrimeSound);
+            nextCrimeSound.Play(audioSource);
             ShowNextCrime?.Invoke();
             step++;
             yield return new WaitForSeconds(newCrimeDelay);
diff --git a/Assets/Scripts/Utils/Scenes.cs b/Assets/Scripts/Utils/Scenes.cs
index bbd877b49..c3d21f400 100644
--- a/Assets/Scripts/Utils/Scenes.cs
+++ b/Assets/Scripts/Utils/Scenes.cs
@@ -4,4 +4,7 @@ public class Scenes
     public const string ClientLobby = "ClientLobby";
     public const string TrainingMode = "TrainingMode";
     public const string Bidding = "Bidding";
+
+    public static readonly string[] MenuScenes = new[] { Menu, ClientLobby };
+    public static readonly string[] NotArenaScenes = new[] { Menu, ClientLobby, Bidding };
 }