diff --git a/ByeByeBuffs/ByeByeBuffs.lua b/ByeByeBuffs/ByeByeBuffs.lua
index 9a7590c..9bf7903 100644
--- a/ByeByeBuffs/ByeByeBuffs.lua
+++ b/ByeByeBuffs/ByeByeBuffs.lua
@@ -5,40 +5,48 @@ ByeByeBuffs.author = GetAddOnMetadata("ByeByeBuffs", "Author")
 print(("Loaded %s v%s by %s."):format(ByeByeBuffs.title, ByeByeBuffs.version, ByeByeBuffs.author))
 
 local blacklistedAuras = {
-	"Honorless Target",
-	"Cozy Fire",
-	"Find Minerals",
-	"Find Herbs",
-	"Unending Breath",
-	"Water Breathing",
-	"Water Walking",
-	"Detect Lesser Invisibility",
-	"Detect Invisibility",
-	"Detect Greater Invisibility",
-	"Arcane Intellect",
-	"Arcane Brilliance",
-	"Blessing of Wisdom",
-	"Blessing of Sanctuary",
-	"Greater Blessing of Wisdom",
-	"Greater Blessing of Sanctuary",
-	"Divine Spirit",
-	"Prayer of Spirit",
-	"Renew",
-	"Regrowth",
-	"Rejuvenation",
-	"Greater Heal",
-	"Inspiration",
-	"Innervate",
-	"Lightwell Renew",
-	"Thorns",
-	"Bloodthirst",
-	"Armor of Faith",
-	"Power Infusion",
-	"Healing Way",
-	"Ancestral Fortitude",
-	"Headmaster's Charge",
-    "Seal of the Dawn",
-    "Champion of the Dawn",
+    "Honorless Target",
+    "Cozy Fire",
+    "Find Minerals",
+    "Find Herbs",
+    "Slip'kik's Savvy",
+    "Unending Breath",
+    "Water Breathing",
+    "Water Walking",
+    "Detect Lesser Invisibility",
+    "Detect Invisibility",
+    "Detect Greater Invisibility",
+    "Arcane Intellect",
+    "Arcane Brilliance",
+    "Blessing of Wisdom",
+    "Blessing of Sanctuary",
+    "Greater Blessing of Wisdom",
+    "Greater Blessing of Sanctuary",
+    "Divine Spirit",
+    "Prayer of Spirit",
+    --"Renew",
+    "Regrowth",
+    --"Rejuvenation",
+    "Greater Heal",
+    "Inspiration",
+    "Holy Power",
+    "Innervate",
+    "Lightwell Renew",
+    "Thorns",
+    "Bloodthirst",
+    "Armor of Faith",
+    "Power Infusion",
+    "Healing Way",
+    "Ancestral Fortitude",
+    "Headmaster's Charge",
+    "Agility",
+    "Intellect",
+    "Armor",
+    "Spirit",
+    "Stamina",
+    "Strength",
+    "Lightning Shield",
+    "Argent Dawn Commission",
 }
 local cancelBlacklistedAurasMacro = "/cancelaura " .. table.concat(blacklistedAuras, "\n/cancelaura ")
 
@@ -50,10 +58,8 @@ local frame = CreateFrame("FRAME")
 frame:RegisterEvent("PLAYER_REGEN_ENABLED")
 frame:RegisterEvent("PLAYER_ENTERING_WORLD")
 frame:SetScript("OnEvent", function(self, event, ...)
-    local isWorldBuffed = IsInRaid() and UnitAura("player", 22, "HELPFUL")  -- simply checks for more than 22 buffs
-    if isWorldBuffed then
+    if IsInInstance() then
         return button:SetAttribute("macrotext", cancelBlacklistedAurasMacro)
     end
     return button:SetAttribute("macrotext", "/stopmacro")
 end)
-