diff --git a/src/MythicPlusUtils/MythicPlusUtils.lua b/src/MythicPlusUtils/MythicPlusUtils.lua
index 4dac63f..0352770 100644
--- a/src/MythicPlusUtils/MythicPlusUtils.lua
+++ b/src/MythicPlusUtils/MythicPlusUtils.lua
@@ -12,117 +12,71 @@ function MythicPlusUtils:New()
 
     self.random = math.random(1000000, 9999999)
     self.kickList = {
-
         -- Algeth'ar Academy
-        [388392] = true, -- Monotonous Lecture
-        [396812] = true, -- Mystic Blast
-        [377389] = true, -- Call of the Flock
-        [396640] = true, -- Healing Touch
-        [387843] = true, -- Astral Bomb
-        [387955] = true, -- Celestial Shield
-        [387910] = true, -- Astral Whirlwind
-
-        -- Azure Vault
-        -- [375602] = true, -- Erratic Growth
-        [387564] = true, -- Mystic Vapors
-        -- [386546] = true, -- Waking Bane
-        [389804] = true, -- Heavy Tome
-        [377488] = true, -- Icy Bindings
-
-        -- Brackenhide
-        [382249] = true, -- Earth Bolt
-        [367500] = true, -- Hideous Cackle
-        [377950] = true, -- Greater Healing Rapids
-        [385029] = true, -- Screech
-        [373804] = true, -- Touch of Decay
-        [381770] = true, -- Gushing Ooze
-        [374544] = true, -- Burst of Decay
-
-        -- Halls of Infusion
-        [374066] = true, -- Earth Shield
-        [374339] = true, -- Demoralizing Shout
-        [374045] = true, -- Expulse
-        [374080] = true, -- Blasting Gust
-        [389443] = true, -- Purifying Blast
-        [395694] = true, -- Elemental Focus
-        [374563] = true, -- Dazzle
-        [385141] = true, -- Thunderstorm
-        [374706] = true, -- Pyretic Burst
-        [375384] = true, -- Rumbling Earth
-        [375950] = true, -- Ice Shards
-        [377348] = true, -- Tidal Divergence
-        [377402] = true, -- Aqueous Barrier
-        [387618] = true, -- Infuse
-
-        -- Neltharus
-        [378282] = true, -- Molten Core
-        [372615] = true, -- Ember Reach
-        [395427] = true, -- Burning Roar
-        [372538] = true, -- Melt
-        [384161] = true, -- Mote of Combustion
-        [382795] = true, -- Molten Barrier
-
-        -- Nokhud
-        [384365] = true, -- Disruptive Shout
-        [386024] = true, -- Tempest
-        [387411] = true, -- Death Bolt Volley
-        [387606] = true, -- Dominate
-        [376725] = true, -- Storm Bolt
-        [384808] = true, -- Guardian Wind
-        [383823] = true, -- Rally the Clan (CC to interrupt)
-        [387135] = true, -- Arcing Strike (CC to interrupt)
-        [373395] = true, -- Bloodcurdling Shout
-
-        -- Ruby Life Pools
-        [373017] = true, -- Roaring Blaze
-        [392398] = true, -- Crackling Detonation
-        [392451] = true, -- Flashfire
-        [385310] = true, -- Lightning Bolt
-        [375602] = true, -- Erratic Growth
-        -- [386546] = true, -- Waking Bane
-        -- [387564] = true, -- Mystic Vapors
-        [373932] = true, -- Illusionary Bolt
-        [386546] = true, -- Waking Bane
-
-        -- Uldaman
-        [369675] = true, -- Chain Lightning
-        [369674] = true, -- Stone Spike
-        [369823] = true, -- Spiked Carapace
-        [369603] = true, -- Defensive Bulwark
-        [369399] = true, -- Stone Bolt
-        [369400] = true, -- Earthen Ward
+        [396812] = true,
+        [388392] = true,
+        [388863] = true,
+        [388862] = true,
+        [377389] = true,
+        [388623] = true,
+        [396640] = true,
+        [387975] = true,
+        [387843] = true,
 
         -- Court of Stars
-        [211401] = true, -- Drifting Embers
-        [211464] = true, -- Fel Detonation
-        [207980] = true, -- Disintegration Beam
-        [208165] = true, -- Withering Soul
-        [207881] = true, -- Infernal Eruption
+        [211401] = true,
+        [207980] = true,
+        [208165] = true,
+        [207881] = true,
+        [209413] = true,
 
         -- Halls of Valor
-        [198595] = true, -- Thunderous Bolt
-        [198959] = true, -- Etch
-        [192288] = true, -- Searing Light
-        [199726] = true, -- Unruly Yell
-        [198750] = true, --  Surge
+        [198595] = true,
+        [198959] = true,
+        [215433] = true,
+        [192288] = true,
+        [199726] = true,
+        [198750] = true,
+
+        -- Ruby Life Pools
+        [372749] = true,
+        [373803] = true,
+        [373017] = true,
+        [392398] = true,
+        [392451] = true,
+        [385310] = true,
 
         -- Shadowmoon Burial Grounds
-        [152818] = true, -- Shadow Mend
-        [153153] = true, -- Dark Communion (CC to interrupt)
-        [156776] = true, -- Rending Voidlash
-        [156722] = true, -- Void Bolt
-        [398206] = true, -- Death Blast
-        [156718] = true, -- Necrotic Burst
-        [153524] = true, -- Plague Spit
+        [152818] = true,
+        [156776] = true,
+        [156722] = true,
+        [398206] = true,
+        [153524] = true,
+        [156718] = true,
 
         -- Temple of the Jade Serpent
-        [397888] = true, -- Hydrolance
-        [114646] = true, -- Haunting Gaze
-        [395859] = true, -- Haunting Scream
-        [396073] = true, -- Cat Nap
-        [397914] = true, -- Defiling Mist
-
-        [315584] = true
+        [397888] = true,
+        [395859] = true,
+        [396073] = true,
+        [397914] = true,
+
+        -- The Azure Vault
+        [375602] = true,
+        [387564] = true,
+        [373932] = true,
+        [386546] = true,
+        [389804] = true,
+        [377488] = true,
+        [377503] = true,
+
+        -- NO
+        [384365] = true,
+        [386012] = true,
+        [386024] = true,
+        [387411] = true,
+        [387606] = true,
+        [373395] = true,
+        [376725] = true,
     }
 
     Bastion.EventManager:RegisterWoWEvent('UNIT_AURA', function(unit, auras)