diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs
index 1eff61c7..5a629822 100644
--- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs
@@ -103,22 +103,15 @@ public partial class Homeowner1 : BehaviourTree
 
 
     //These should be somewhere else
-    Debug.Log("TESTING");
+    //Debug.Log("TESTING");
     AudioHandler.audioClipHandlers["BGMUnalert"] = Audio.CreateAudioClip("event:/Music/player_undetected");
-    Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMUnalert"]);
     AudioHandler.audioClipHandlers["BGMAlert"] = Audio.CreateAudioClip("event:/Music/player_detected");
-    Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMAlert"]);
     AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive");
-    Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMAdaptive"]);
 
     AudioHandler.audioClipHandlers["SFXHumming"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_humming");
-    Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXHumming"]);
     AudioHandler.audioClipHandlers["SFXFootstep"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_footsteps");
-    Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXFootstep"]);
     AudioHandler.audioClipHandlers["SFXDetectAh"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_detect_raccoon");
-    Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXDetectAh"]);
     AudioHandler.audioClipHandlers["SFXDetectSting"] = Audio.CreateAudioClip("event:/Music/stingers/player_detected");
-    Audio.AddAudioClipToSFXChannelGroup(AudioHandler.audioClipHandlers["SFXDetectSting"]);
   }
 
   //Called every tick
diff --git a/Assets/Scripts/Gameplay/Item/SC_Breakable.cs b/Assets/Scripts/Gameplay/Item/SC_Breakable.cs
index 964a8b99..ccfd1c9b 100644
--- a/Assets/Scripts/Gameplay/Item/SC_Breakable.cs
+++ b/Assets/Scripts/Gameplay/Item/SC_Breakable.cs
@@ -1,4 +1,5 @@
 using SHADE;
+using SHADE_Scripting.Audio;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -31,6 +32,8 @@ public class Breakable : Script
     }
 
     isBreak = false;
+
+    AudioHandler.audioClipHandlers["SFXBreak"] = Audio.CreateAudioClip("event:/Props/impact_break");
   }
 
   protected override void update()
@@ -69,7 +72,7 @@ public class Breakable : Script
     }
 
     isBreak = false;
-    Audio.PlaySFXOnce2D("event:/Props/impact_break");
+    AudioHandler.audioClipHandlers["SFXBreak"].Play();
     GameObject.SetActive(false);
   }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Gameplay/Item/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs
index 1494ea42..0c8dabe6 100644
--- a/Assets/Scripts/Gameplay/Item/SC_Item.cs
+++ b/Assets/Scripts/Gameplay/Item/SC_Item.cs
@@ -1,4 +1,5 @@
 using SHADE;
+using SHADE_Scripting.Audio;
 using System;
 public class Item : Script
 {
@@ -29,6 +30,9 @@ public class Item : Script
       collider.GetCollisionShape(0).Density = density;
 
     returnBack = false;
+
+    AudioHandler.audioClipHandlers["SFXImpactElastic"] = Audio.CreateAudioClip("event:/Props/impact_elastic");
+    AudioHandler.audioClipHandlers["SFXImpactHard"] = Audio.CreateAudioClip("event:/Props/impact_hard");
   }
 
   protected override void start()
@@ -54,11 +58,11 @@ public class Item : Script
     }
 
     if (playSound)
-    { 
-      if(currCategory == ItemCategory.LIGHT)
-        Audio.PlaySFXOnce2D("event:/Props/impact_elastic");
+    {
+      if (currCategory == ItemCategory.LIGHT)
+        AudioHandler.audioClipHandlers["SFXImpactElastic"].Play();
       else if (currCategory == ItemCategory.MEDIUM || currCategory == ItemCategory.HEAVY)
-        Audio.PlaySFXOnce2D("event:/Props/impact_hard");
+        AudioHandler.audioClipHandlers["SFXImpactHard"].Play();
       playSound = false;
     }
 
diff --git a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs
index f933f9bc..0eef97f3 100644
--- a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs
+++ b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs
@@ -1,5 +1,6 @@
 using SHADE;
 using SHADE_Scripting;
+using SHADE_Scripting.Audio;
 using System;
 using System.Collections.Generic;
 using static PlayerController;
@@ -43,6 +44,8 @@ public class PickAndThrow : Script
     if(!tpc)
       Debug.LogError("TPC EMPTY");
 
+    AudioHandler.audioClipHandlers["SFXThrow"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw");
+
     timer = delayTimer;
   }
   protected override void update()
@@ -72,7 +75,7 @@ public class PickAndThrow : Script
 
         if (Input.GetMouseButtonUp(Input.MouseCode.LeftButton) && pc.isAiming)
         {
-          Audio.PlaySFXOnce2D("event:/Raccoon/raccoon_throw");
+          AudioHandler.audioClipHandlers["SFXThrow"].Play();
           itemRidigBody.IsGravityEnabled = true;
           itemCollider.GetCollisionShape(0).IsTrigger = false;
           pc.isAiming = false;
diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs
index 484ea5c4..cecc1805 100644
--- a/Assets/Scripts/Gameplay/SC_GameManager.cs
+++ b/Assets/Scripts/Gameplay/SC_GameManager.cs
@@ -37,7 +37,6 @@ public class GameManager : Script
       Instance = this;
 
     AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive");
-    Audio.AddAudioClipToBGMChannelGroup(AudioHandler.audioClipHandlers["BGMAdaptive"]);
     AudioHandler.audioClipHandlers["BGMAdaptive"].Play();
     AudioHandler.audioClipHandlers["BGMAdaptive"].SetParameter("Detected", 0.0f);
     //Audio.PlayBGMOnce2D("event:/Music/player_undetected");
diff --git a/Assets/Scripts/Gameplay/SC_ScoringZone.cs b/Assets/Scripts/Gameplay/SC_ScoringZone.cs
index 5a3aff64..0a48c2a1 100644
--- a/Assets/Scripts/Gameplay/SC_ScoringZone.cs
+++ b/Assets/Scripts/Gameplay/SC_ScoringZone.cs
@@ -1,17 +1,19 @@
 using SHADE;
+using SHADE_Scripting.Audio;
 using System;
 public class ScoringZone : Script
 {
 
   protected override void awake()
   {
+    AudioHandler.audioClipHandlers["SFXItemScore"] = Audio.CreateAudioClip("event:/Music/stingers/item_scored");
   }
 
   protected override void onTriggerEnter(CollisionInfo info)
   {
     if (GameManager.Instance && info.GameObject.GetScript<Item>())
     {
-      Audio.PlaySFXOnce2D("event:/Music/stingers/item_scored");
+      AudioHandler.audioClipHandlers["SFXItemScore"].Play();
       GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score;
       GameManager.Instance.totalItemCount -= 1;
       info.GameObject.SetActive(false);