diff --git a/DBM-Challenges/DBM-Challenges.toc b/DBM-Challenges/DBM-Challenges.toc
index 0535123..e016288 100755
--- a/DBM-Challenges/DBM-Challenges.toc
+++ b/DBM-Challenges/DBM-Challenges.toc
@@ -1,4 +1,4 @@
-## Interface: 80100
+## Interface: 80200
 ## X-Min-Interface: 80000
 ## Title:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Challenges|r
 ## Title-deDE:|cffffe00a<|r|cffff7d0aDBM|r|cffffe00a>|r |cff69ccf0Herausforderungen|r
diff --git a/DBM-Challenges/LegionArtifacts/DPSFelTotem.lua b/DBM-Challenges/LegionArtifacts/DPSFelTotem.lua
index d995e22..3eec963 100644
--- a/DBM-Challenges/LegionArtifacts/DPSFelTotem.lua
+++ b/DBM-Challenges/LegionArtifacts/DPSFelTotem.lua
@@ -39,8 +39,6 @@ local timerFelSurgeCD		= mod:NewCDTimer(25, 242496, nil, nil, nil, 3)--25-33
 local timerFelRuptureCD		= mod:NewCDTimer(10.9, 241664, nil, nil, nil, 3)--10.9-13.4
 local timerFelBurstCD		= mod:NewCDCountTimer(10.9, 242733, nil, nil, nil, 3)--HIGHLY variable
 
---local countdownTimer		= mod:NewCountdownFades(10, 141582)
-
 --[[
 ["242733-Fel Burst"] = "pull:40.2, 23.1, 21.8, 20.7, 21.9, 18.2, 17.7, 19.2, 15.4, 15.8, 14.6, 23.1, 13.3, 12.1, 12.1, 24.3, 10.9, 12.1, 12.1, 19.4",
 ["242733-Fel Burst"] = "pull:19.0, 23.1, 21.9, 20.6, 20.7, 19.5, 18.2, 24.3, 15.8, 15.8, 14.6, 17.0, 13.4, 12.1",
diff --git a/DBM-Challenges/LegionArtifacts/DPSImpossibleFoe.lua b/DBM-Challenges/LegionArtifacts/DPSImpossibleFoe.lua
index bd429f4..a7b7233 100644
--- a/DBM-Challenges/LegionArtifacts/DPSImpossibleFoe.lua
+++ b/DBM-Challenges/LegionArtifacts/DPSImpossibleFoe.lua
@@ -22,9 +22,7 @@ local specWarnImpServants		= mod:NewSpecialWarningSwitch(235140, nil, nil, nil,
 local specWarnDarkFury			= mod:NewSpecialWarningSwitch(243111, nil, nil, nil, 1, 7)
 
 local timerImpServantsCD		= mod:NewCDTimer(45, 235140, nil, nil, nil, 1)
-local timerDarkFuryCD			= mod:NewCDTimer(51.1, 243111, nil, nil, nil, 5)
-
-local countdownDarkFury			= mod:NewCountdown(10, 243111)
+local timerDarkFuryCD			= mod:NewCDTimer(51.1, 243111, nil, nil, nil, 5, nil, nil, nil, 1, 4)
 
 mod:AddInfoFrameOption(243113, true)
 
@@ -34,7 +32,6 @@ function mod:OnCombatStart(delay)
 	self.vb.phase = 1
 	timerImpServantsCD:Start(11-delay)--14 in one log, 11 in another
 	timerDarkFuryCD:Start(50-delay)
-	countdownDarkFury:Start(50-delay)
 end
 
 function mod:OnCombatEnd()
@@ -50,10 +47,8 @@ function mod:SPELL_AURA_APPLIED(args)
 		specWarnDarkFury:Play("attackshield")
 		if self.vb.phase == 2 then
 			timerDarkFuryCD:Start(68)
-			countdownDarkFury:Start(68)
 		else
 			timerDarkFuryCD:Start()
-			countdownDarkFury:Start(51.1)
 		end
 		if self.Options.InfoFrame then
 			DBM.InfoFrame:SetHeader(args.spellName)
diff --git a/DBM-Challenges/LegionArtifacts/DPSQueen.lua b/DBM-Challenges/LegionArtifacts/DPSQueen.lua
index 06873ae..dcbfdb5 100644
--- a/DBM-Challenges/LegionArtifacts/DPSQueen.lua
+++ b/DBM-Challenges/LegionArtifacts/DPSQueen.lua
@@ -39,7 +39,7 @@ local specWarnKnowledge			= mod:NewSpecialWarningSwitch(237952, nil, nil, nil, 1
 --Timers obviously affected by CC usage
 local timerThrowSpearCD			= mod:NewCDTimer(13.4, 238694, nil, nil, nil, 3)
 --local timerAdvanceCD			= mod:NewCDTimer(13.4, 237849, nil, nil, nil, 2)
-local timerBloodFatherCD		= mod:NewCDCountTimer(13.4, 237945, nil, nil, nil, 2)
+local timerBloodFatherCD		= mod:NewCDCountTimer(13.4, 237945, nil, nil, nil, 2, nil, nil, nil, 1, 4)
 local timerDarkWingsCD			= mod:NewCDTimer(20, 237772, nil, nil, nil, 3)
 --Jarl Velbrand
 local timerBerserkersRageCD		= mod:NewCDCountTimer(13.4, 237947, nil, nil, nil, 3)
@@ -48,8 +48,6 @@ local timerBladeStormCD			= mod:NewCDCountTimer(13.4, 237857, nil, nil, nil, 2)
 local timerRunicDetonationCD	= mod:NewCDCountTimer(13.4, 237914, nil, nil, nil, 5)
 local timerKnowledgeCD			= mod:NewCDCountTimer(13.4, 237952, nil, nil, nil, 3)
 
-local countdownTimer			= mod:NewCountdown(13.4, 237945)
-
 --This may not be accurate way to do it, it may be some kind of shared CD like HFC council and just be grossly affected by CCs
 --These are ones consistent between 4 pulls (including kill) though
 local bladeStormTimers = {125.0, 105.0, 30.0}
@@ -79,7 +77,6 @@ function mod:OnCombatStart(delay)
 	timerBerserkersRageCD:Start(26, 1)
 	timerRunicDetonationCD:Start(43, 1)
 	timerBloodFatherCD:Start(61, 1)
-	countdownTimer:Start(61)
 	timerKnowledgeCD:Start(98, 1)
 	timerBladeStormCD:Start(125, 1)
 	timerDarkWingsCD:Start(146)
@@ -108,7 +105,6 @@ function mod:SPELL_CAST_START(args)
 		local timer = bloodFatherTimers[bloodCount+1]
 		if timer then
 			timerBloodFatherCD:Start(timer, bloodCount+1)
-			countdownTimer:Start(timer)
 		end
 	elseif spellId == 237857 then
 		bladeCount = bladeCount + 1
diff --git a/DBM-Challenges/LegionArtifacts/DPSTwins.lua b/DBM-Challenges/LegionArtifacts/DPSTwins.lua
index f32ab49..0a715d5 100644
--- a/DBM-Challenges/LegionArtifacts/DPSTwins.lua
+++ b/DBM-Challenges/LegionArtifacts/DPSTwins.lua
@@ -31,12 +31,9 @@ local specWarnRune				= mod:NewSpecialWarningMoveTo(236460, nil, nil, nil, 1, 2)
 --Karam
 local timerRisingDragonCD		= mod:NewCDTimer(35, 235426, nil, nil, nil, 2)
 --Raest
-local timerHandCD				= mod:NewNextTimer(28, 235580, nil, nil, nil, 1, 235578, DBM_CORE_DAMAGE_ICON)
+local timerHandCD				= mod:NewNextTimer(28, 235580, nil, nil, nil, 1, 235578, DBM_CORE_DAMAGE_ICON, nil, 1, 4)
 local timerGraspCD				= mod:NewCDTimer(15, 235578, nil, nil, nil, 4, nil, DBM_CORE_INTERRUPT_ICON)
-local timerRuneCD				= mod:NewCDTimer(35, 236460, nil, nil, nil, 5)
-
-local countHand					= mod:NewCountdown(28, 235580)
-local countRune					= mod:NewCountdown("Alt35", 236460)
+local timerRuneCD				= mod:NewCDTimer(35, 236460, nil, nil, nil, 5, nil, nil, nil, 2, 4)
 
 mod.vb.phase = 1
 
@@ -53,7 +50,6 @@ function mod:SPELL_CAST_START(args)
 		else--4
 			warnPhase:Show(DBM_CORE_AUTO_ANNOUNCE_TEXTS.stage:format(4))
 			timerHandCD:Stop()
-			countHand:Cancel()
 		end
 	elseif spellId == 235578 then--Grasp from Beyond
 		specWarnGrasp:Show(args.sourceName)
@@ -89,24 +85,20 @@ function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
 		if self.vb.phase >= 2 then--Should filter fixate done on pull
 			self.vb.phase = self.vb.phase + 1
 			timerHandCD:Start(9)
-			countHand:Start(9)
 			if self.vb.phase == 3 then
 				warnPhase:Show(DBM_CORE_AUTO_ANNOUNCE_TEXTS.stage:format(3))
 			else--5
 				warnPhase:Show(DBM_CORE_AUTO_ANNOUNCE_TEXTS.stage:format(5))
 				timerRuneCD:Start(18.2)
-				countRune:Start(18.2)
 				timerRisingDragonCD:Start(25)--Only one time? need more data to be sure
 			end
 		end
 	elseif spellId == 235580 then--Hand from Beyond
 		timerHandCD:Start()
-		countHand:Start()
 	elseif spellId == 236468 then--Rune of Summoning
 		specWarnRune:Show(RUNES)
 		specWarnRune:Play("157060")
 		timerRuneCD:Start()
-		countRune:Start()
 	elseif spellId == 235525 then--Tear Rift (about 3 seconds after Dismiss)
 		specWarnRift:Show()
 		specWarnRift:Play("killmob")
diff --git a/DBM-Challenges/LegionArtifacts/DPSXylem.lua b/DBM-Challenges/LegionArtifacts/DPSXylem.lua
index cea1d36..447021b 100644
--- a/DBM-Challenges/LegionArtifacts/DPSXylem.lua
+++ b/DBM-Challenges/LegionArtifacts/DPSXylem.lua
@@ -44,8 +44,6 @@ local timerShadowBarrageCD			= mod:NewCDTimer(40.0, 231443, nil, nil, nil, 3)--A
 --Arcane Phase
 local timerDrawPowerCD				= mod:NewCDTimer(18.2, 231522, nil, nil, nil, 4, nil, DBM_CORE_INTERRUPT_ICON)
 
---local countdownTimer				= mod:NewCountdownFades(10, 141582)
-
 local activeBossGUIDS = {}
 
 function mod:OnCombatStart(delay)
diff --git a/DBM-Challenges/LegionArtifacts/Healer.lua b/DBM-Challenges/LegionArtifacts/Healer.lua
index ffc5161..27d1661 100644
--- a/DBM-Challenges/LegionArtifacts/Healer.lua
+++ b/DBM-Challenges/LegionArtifacts/Healer.lua
@@ -23,9 +23,7 @@ local specWarnArcaneBlitz		= mod:NewSpecialWarningStack(235833, nil, 4, nil, nil
 local specWarnIgniteSoul		= mod:NewSpecialWarningYou(237188, nil, nil, nil, 3, 2)
 
 --local timerEarthquakeCD		= mod:NewNextTimer(60, 237950, nil, nil, nil, 2)
-local timerIgniteSoulCD			= mod:NewAITimer(18, 237188, nil, nil, nil, 3, nil, DBM_CORE_DEADLY_ICON)
-
-local countdownIngiteSoul		= mod:NewCountdownFades("AltTwo9", 237188)
+local timerIgniteSoulCD			= mod:NewAITimer(18, 237188, nil, nil, nil, 3, nil, DBM_CORE_DEADLY_ICON, nil, 3, 4)
 
 function mod:SPELL_AURA_APPLIED(args)
 	local spellId = args.spellId
@@ -43,7 +41,6 @@ function mod:SPELL_AURA_APPLIED(args)
 		specWarnManaSling:Show(DBM_ALLY)
 		specWarnManaSling:Play("findshelter")
 	elseif spellId == 237188 then
-		countdownIngiteSoul:Start()
 		specWarnIgniteSoul:Show()
 		specWarnIgniteSoul:Play("targetyou")
 		timerIgniteSoulCD:Start()
diff --git a/DBM-Challenges/LegionArtifacts/Tank.lua b/DBM-Challenges/LegionArtifacts/Tank.lua
index f60e951..e3c8598 100644
--- a/DBM-Challenges/LegionArtifacts/Tank.lua
+++ b/DBM-Challenges/LegionArtifacts/Tank.lua
@@ -22,7 +22,6 @@ mod:RegisterEventsInCombat(
 --Tank
 -- Stack warning? what amounts switch from reg warning to special warning?
 -- Improve timers still with more data?
--- Countdown prioriites?
 --Tank (Kruul)
 local warnHolyWard				= mod:NewCastAnnounce(233473, 1)
 local warnDecay					= mod:NewStackAnnounce(234422, 3)
@@ -40,21 +39,15 @@ local specWarnAnnihilate		= mod:NewSpecialWarningDefensive(236572, nil, nil, nil
 local specWarnTwistedReflection	= mod:NewSpecialWarningInterrupt(234676, nil, nil, nil, 3, 2)
 
 --Tank
-local timerDrainLifeCD			= mod:NewCDTimer(24.3, 234423, nil, nil, nil, 4, nil, DBM_CORE_INTERRUPT_ICON)
+local timerDrainLifeCD			= mod:NewCDTimer(24.3, 234423, nil, nil, nil, 4, nil, DBM_CORE_INTERRUPT_ICON, nil, 2, 4)
 local timerHolyWardCD			= mod:NewCDTimer(33, 233473, nil, nil, nil, 3, nil, DBM_CORE_HEALER_ICON)
 local timerHolyWard				= mod:NewCastTimer(8, 233473, nil, false, nil, 3, nil, DBM_CORE_HEALER_ICON)
 local timerTormentingEyeCD		= mod:NewCDTimer(15.4, 234428, nil, nil, nil, 1, nil, DBM_CORE_DAMAGE_ICON)--15.4-19.4
-local timerNetherAbberationCD	= mod:NewCDTimer(35, 235110, nil, nil, nil, 1, nil, DBM_CORE_DAMAGE_ICON)
-local timerInfernalCD			= mod:NewCDTimer(65, 235112, nil, nil, nil, 1, nil, DBM_CORE_DAMAGE_ICON)
+local timerNetherAbberationCD	= mod:NewCDTimer(35, 235110, nil, nil, nil, 1, nil, DBM_CORE_DAMAGE_ICON, nil, 1, 4)
+local timerInfernalCD			= mod:NewCDTimer(65, 235112, nil, nil, nil, 1, nil, DBM_CORE_DAMAGE_ICON, nil, 3, 4)
 --Phase 2
 local timerShadowSweepCD		= mod:NewCDTimer(20, 234441, nil, nil, nil, 3)--20-27
-local timerAnnihilateCD			= mod:NewCDCountTimer(27, 236572, nil, nil, nil, 3, nil, DBM_CORE_TANK_ICON)
-
-local countdownAbberations		= mod:NewCountdown(35, 235110)
-local countdownDrainLife		= mod:NewCountdown("Alt24", 234423)
-local countdownInfernal			= mod:NewCountdown("AltTwo65", 235112)
---Phase 2
-local countdownAnnihilate		= mod:NewCountdown("Alt27", 236572)
+local timerAnnihilateCD			= mod:NewCDCountTimer(27, 236572, nil, nil, nil, 3, nil, DBM_CORE_TANK_ICON, nil, 2, 4)
 
 mod.vb.phase = 1
 mod.vb.annihilateCast = 0
@@ -65,12 +58,9 @@ function mod:OnCombatStart(delay)
 	self.vb.annihilateCast = 0
 	timerTormentingEyeCD:Start(3.8)--3.8-5
 	timerDrainLifeCD:Start(5)--5-9?
-	countdownDrainLife:Start(5)
 	timerHolyWardCD:Start(8)--8-16
 	timerNetherAbberationCD:Start(9.6)--9.6-12.3
-	countdownAbberations:Start(9.6)
 	timerInfernalCD:Start(37.5)--37-43
-	countdownInfernal:Start(37.5)
 	DBM:AddMsg("There is a chance some of these timers are health based and can't be completely relied upon. More data is needed")
 end
 
@@ -80,7 +70,6 @@ function mod:SPELL_CAST_START(args)
 		specWarnDrainLife:Show(args.sourceName)
 		specWarnDrainLife:Play("kickcast")
 		timerDrainLifeCD:Start()
-		countdownDrainLife:Start()
 	elseif spellId == 233473 then
 		warnHolyWard:Show()
 		timerHolyWard:Start()
@@ -101,7 +90,6 @@ function mod:SPELL_CAST_SUCCESS(args)
 	if args.spellId == 236572 then--Timer here, boss sometimes stutter casts/interrupts his own annihilate cast to do soething else, then returns to annihilate 4-5 seconds later
 		self.vb.annihilateCast = self.vb.annihilateCast + 1
 		timerAnnihilateCD:Start(25, self.vb.annihilateCast+1)
-		countdownAnnihilate:Start()
 	end
 end
 
@@ -131,12 +119,9 @@ function mod:UNIT_DIED(args)
 	if cid == 117933 then--Variss
 		self.vb.phase = 2
 		timerDrainLifeCD:Stop()
-		countdownDrainLife:Cancel()
 		timerTormentingEyeCD:Stop()
 		timerNetherAbberationCD:Stop()
-		countdownAbberations:Cancel()
 		timerInfernalCD:Stop()
-		countdownInfernal:Cancel()
 		--timerAnnihilateCD:Start(16.5, 1)--16-28?, too variable, disabled for now
 		--Does holy ward reset here? reset timer here if it does
 	end
@@ -150,15 +135,12 @@ function mod:UNIT_SPELLCAST_SUCCEEDED(uId, _, spellId)
 		warnNetherAberration:Show()
 		if self.vb.phase == 2 then
 			timerNetherAbberationCD:Start(30)
-			countdownAbberations:Start(30)
 		else
 			timerNetherAbberationCD:Start()--35
-			countdownAbberations:Start(35)
 		end
 	elseif spellId == 235112 then--Smoldering Infernal Summon
 		warnInfernal:Show()
 		timerInfernalCD:Start()
-		countdownInfernal:Start()
 	elseif spellId == 234920 then
 		warnShadowSweep:Show()
 		timerShadowSweepCD:Start()
diff --git a/DBM-Challenges/PGWhiteTiger.lua b/DBM-Challenges/PGWhiteTiger.lua
index a512b26..02decbd 100755
--- a/DBM-Challenges/PGWhiteTiger.lua
+++ b/DBM-Challenges/PGWhiteTiger.lua
@@ -71,8 +71,6 @@ local timerHealIllusionCD	= mod:NewNextTimer(20, 142238, nil, nil, nil, 4)
 local timerAquaBombCD		= mod:NewCDTimer(12, 145206, nil, false, nil, 5)--12-22 second variation? off by default do to this
 local timerSonicBlastCD		= mod:NewCDTimer(6, 145200, nil, nil, nil, 2)--8-11sec variation
 
-local countdownTimer		= mod:NewCountdownFades(10, 141582)
-
 local started = false
 
 function mod:SPELL_CAST_START(args)
@@ -180,8 +178,6 @@ function mod:SCENARIO_UPDATE(newStep)
 	local diffID, currWave, maxWave, duration = C_Scenario.GetProvingGroundsInfo()
 	if diffID > 0 then
 		started = true
-		countdownTimer:Cancel()
-		countdownTimer:Start(duration)
 		if DBM.Options.AutoRespond then--Use global whisper option
 			self:RegisterShortTermEvents(
 				"CHAT_MSG_WHISPER"
@@ -189,7 +185,6 @@ function mod:SCENARIO_UPDATE(newStep)
 		end
 	elseif started then
 		started = false
-		countdownTimer:Cancel()
 		self:UnregisterShortTermEvents()
 	end
 end