diff --git a/MaxDps_Priest.toc b/MaxDps_Priest.toc
index 11d5fad..5373079 100644
--- a/MaxDps_Priest.toc
+++ b/MaxDps_Priest.toc
@@ -1,7 +1,7 @@
 ## Title: MaxDps_Priest
-## Version: 8.3.0
+## Version: 9.0.0
 ## Author: Kaminaris
-## Interface: 80300
+## Interface: 90001
 ## Dependencies: MaxDps
 ## LoadOnDemand: 1
 ## X-Curse-Project-ID: 98744
diff --git a/main.lua b/main.lua
index 07745b9..41642e4 100644
--- a/main.lua
+++ b/main.lua
@@ -1,51 +1,61 @@
 --- @type MaxDps
 if not MaxDps then
-	return ;
+	return;
 end
 
 local MaxDps = MaxDps;
 
 local Priest = MaxDps:NewModule('Priest');
 
+-- Priest spells
+local PR = {
+	PowerWordFortitude = 21562
+};
+
+-- Shadow Spells
 local SH = {
-	Shadowform         = 232698,
-	MindBlast          = 8092,
-	ShadowWordVoid     = 205351,
-	ShadowWordPain     = 589,
-	VampiricTouch      = 34914,
-	Misery             = 238558,
-	VoidEruption       = 228260,
-	DarkAscension      = 280711,
-	--Voidform           = 228264,
-	Voidform           = 194249,
-	VoidBolt           = 228266,
-	VoidBolt2          = 205448,
-	DarkVoid           = 263346,
-	SurrenderToMadness = 193223,
-	Mindbender         = 200174,
-	Shadowfiend        = 34433,
-	ShadowCrash        = 205385,
-	MindSear           = 48045,
-	ShadowWordDeath    = 32379,
-	VoidTorrent        = 263165,
-	LegacyOfTheVoid    = 193225,
-	MindFlay           = 15407
+	Shadowform = 232698,
+	MindBlast = 8092,
+	ShadowWordVoid = 205351,
+	ShadowWordPain = 589,
+	VampiricTouch = 34914,
+	Misery = 238558,
+	VoidEruption = 228260,
+	DarkAscension = 280711,
+	Voidform = 194249,
+	VoidBolt = 205448,
+	DarkThought = 341207,
+	DarkVoid = 263346,
+	SurrenderToMadness = 319952,
+	Mindbender = 200174,
+	Shadowfiend = 132603,
+	ShadowCrash = 205385,
+	MindSear = 48045,
+	ShadowWordDeath = 32379,
+	VoidTorrent = 263165,
+	LegacyOfTheVoid = 193225,
+	MindFlay = 15407,
+	Damnation = 341374,
+	DevouringPlague = 335467,
+	UnfurlingDarkness = 341282,
+	Voidling = 254232,
+	SearingNightmare = 341385
 };
 
--- Spells
+-- Disc Spells
 local DI = {
-	Penance            = 47540,
-	PurgeTheWicked     = 204197,
+	Penance = 47540,
+	PurgeTheWicked = 204197,
 	PurgeTheWickedAura = 204213,
-	Penance            = 47540,
-	Smite              = 585,
-	SmiteAura          = 208772,
-	PowerWordSolace    = 129250,
-	ShadowWordPain     = 589,
-	Schism             = 214621,
-	DivineStar         = 110744,
-	Shadowfiend        = 34433,
-	Mindbender         = 123040
+	Penance = 47540,
+	Smite = 585,
+	SmiteAura = 208772,
+	PowerWordSolace = 129250,
+	ShadowWordPain = 589,
+	Schism = 214621,
+	DivineStar = 110744,
+	Shadowfiend = 34433,
+	Mindbender = 123040
 };
 
 local spellMeta = {
@@ -65,7 +75,7 @@ function Priest:Enable()
 		MaxDps.NextSpell = Priest.Holy;
 	elseif MaxDps.Spec == 3 then
 		MaxDps.NextSpell = Priest.Shadow;
-	end ;
+	end
 
 	return true;
 end
@@ -80,6 +90,10 @@ function Priest:Discipline()
 
 	MaxDps:GlowEssences();
 
+	if not buff[PR.PowerWordFortitude].up then
+		return PR.PowerWordFortitude;
+	end
+
 	if talents[DI.Mindbender] then
 		MaxDps:GlowCooldown(DI.Mindbender, cooldown[DI.Mindbender].ready);
 	else
@@ -125,322 +139,128 @@ function Priest:Shadow()
 	fd.targets = targets;
 	fd.targetHp = MaxDps:TargetPercentHealth();
 
-	local VoidBolt = MaxDps:FindSpell(SH.VoidEruption) and SH.VoidEruption or
-		(MaxDps:FindSpell(SH.VoidBolt) and SH.VoidBolt or SH.VoidBolt2);
-	fd.VoidBolt = VoidBolt;
-
 	MaxDps:GlowEssences();
 
-	if talents[SH.SurrenderToMadness] then
-		MaxDps:GlowCooldown(
-			SH.SurrenderToMadness,
-			cooldown[SH.SurrenderToMadness].ready and buff[SH.Voidform].count >= 15
-		);
-	end
-
-	if not talents[SH.Mindbender] then
-		MaxDps:GlowCooldown(SH.Shadowfiend, cooldown[SH.Shadowfiend].ready);
-	end
-
-	if not InCombatLockdown() then
-		return Priest:ShadowPrecombat();
-	end
-
-	-- run_action_list,name=aoe,if=spell_targets.mind_sear>(5+1*talent.misery.enabled);
-	if targets > (5 + (talents[SH.Misery] and 1 or 0)) then
-		return Priest:ShadowAoe();
-	end
-
-	-- run_action_list,name=cleave,if=active_enemies>1;
-	if targets > 1 then
-		return Priest:ShadowCleave();
-	end
-
-	-- run_action_list,name=single,if=active_enemies=1;
 	return Priest:ShadowSingle();
 end
 
-function Priest:ShadowPrecombat()
-	local fd = MaxDps.FrameData;
-	local buff = fd.buff;
-	local currentSpell = fd.currentSpell;
-	local cooldown = fd.cooldown;
-	local talents = fd.talents;
-
-	-- shadowform,if=!buff.shadowform.up;
-	if not buff[SH.Shadowform].up and not buff[SH.Voidform].up then
-		return SH.Shadowform;
-	end
-
-	-- mind_blast;
-	if talents[SH.ShadowWordVoid] then
-		if (cooldown[SH.ShadowWordVoid].charges >= 2 or
-			cooldown[SH.ShadowWordVoid].charges >= 1 and currentSpell ~= SH.ShadowWordVoid)
-		then
-			return SH.ShadowWordVoid;
-		end
-	else
-		if cooldown[SH.MindBlast].ready and currentSpell ~= SH.MindBlast then
-			return SH.MindBlast;
-		end
-	end
-end
-
-function Priest:ShadowAoe()
-	local fd = MaxDps.FrameData;
-	local cooldown = fd.cooldown;
-	local buff = fd.buff;
-	local debuff = fd.debuff;
-	local currentSpell = fd.currentSpell;
-	local talents = fd.talents;
-	local gcd = fd.gcd;
-	local insanity = UnitPower('player', Enum.PowerType.Insanity);
-	local insanityLevel = talents[SH.LegacyOfTheVoid] and 60 or 90;
-	local VoidBolt = fd.VoidBolt;
-
-	-- void_eruption;
-	if not buff[SH.Voidform].up and currentSpell ~= SH.VoidEruption and insanity >= insanityLevel then
-		return SH.VoidEruption;
-	end
-
-	-- dark_ascension,if=buff.voidform.down;
-	if talents[SH.DarkAscension] and cooldown[SH.DarkAscension].ready and
-		not buff[SH.Voidform].up and insanity < 50
-	then
-		return SH.DarkAscension;
-	end
-
-	-- void_bolt,if=talent.dark_void.enabled&dot.shadow_word_pain.remains>travel_time;
-	if buff[SH.Voidform].up and cooldown[SH.VoidBolt2].remains < 0.25 and
-		talents[SH.DarkVoid] and debuff[SH.ShadowWordPain].remains > gcd * 2 then
-		return VoidBolt;
-	end
-
-	-- surrender_to_madness,if=buff.voidform.stack>=(15+buff.bloodlust.up);
-	if talents[SH.SurrenderToMadness] and cooldown[SH.SurrenderToMadness].ready and (buff[SH.Voidform].count >= (15 + buff[SH.Bloodlust].up)) then
-		return SH.SurrenderToMadness;
-	end
-
-	-- dark_void,if=raid_event.adds.in>10;
-	if talents[SH.DarkVoid] and cooldown[SH.DarkVoid].ready and currentSpell ~= SH.DarkVoid then
-		return SH.DarkVoid;
-	end
-
-	-- mindbender;
-	if talents[SH.Mindbender] and cooldown[SH.Mindbender].ready then
-		return SH.Mindbender;
-	end
-
-	-- shadow_crash,if=raid_event.adds.in>5&raid_event.adds.duration<20;
-	if talents[SH.ShadowCrash] and cooldown[SH.ShadowCrash].ready then
-		return SH.ShadowCrash;
-	end
-
-	-- mind_sear,chain=1,interrupt_immediate=1,interrupt_if=ticks>=2&(cooldown.void_bolt.up|cooldown.mind_blast.up);
-	return SH.MindSear;
-end
-
-function Priest:ShadowCleave()
+function Priest:ShadowSingle()
 	local fd = MaxDps.FrameData;
 	local cooldown = fd.cooldown;
 	local buff = fd.buff;
 	local debuff = fd.debuff;
 	local currentSpell = fd.currentSpell;
 	local talents = fd.talents;
-	local targets = fd.targets;
 	local timeToDie = fd.timeToDie;
-	local targetHp = fd.targetHp;
+	local targets = fd.targets;
+	local targetHp = MaxDps:TargetPercentHealth() * 100;
 	local VoidBolt = fd.VoidBolt;
-	local insanity = UnitPower('player', Enum.PowerType.Insanity);
-	local insanityLevel = talents[SH.LegacyOfTheVoid] and 60 or 90;
-
-	-- void_eruption;
-	if not buff[SH.Voidform].up and currentSpell ~= SH.VoidEruption and insanity > insanityLevel then
-		return SH.VoidEruption;
-	end
+	local gcd = fd.gcd;
+	local insanity = UnitPower('player', 13);
 
-	-- dark_ascension,if=buff.voidform.down;
-	if talents[SH.DarkAscension] and cooldown[SH.DarkAscension].ready and (not buff[SH.Voidform].up) then
-		return SH.DarkAscension;
+	-- Voidform
+	if insanity >= 88 and buff[SH.Voidform].up then
+		return SH.DevouringPlague;
 	end
 
-	-- void_bolt;
-	if buff[SH.Voidform].up and cooldown[SH.VoidBolt2].remains < 0.25 then
-		return VoidBolt;
+	if insanity < 88 and buff[SH.Voidform].up and cooldown[SH.VoidBolt].ready then
+		return SH.VoidBolt;
 	end
 
-	-- shadow_word_death,target_if=target.time_to_die<3|buff.voidform.down;
-	if talents[SH.ShadowWordDeath] and targetHp < 0.2 and timeToDie < 3 and not buff[SH.Voidform].up then
-		return SH.ShadowWordDeath;
+	if cooldown[SH.MindBlast].charges >= 1 and buff[SH.Voidform].up then
+		return SH.MindBlast;
 	end
 
-	-- dark_void,if=raid_event.adds.in>10;
-	if talents[SH.DarkVoid] and cooldown[SH.DarkVoid].ready and currentSpell ~= SH.DarkVoid then
-		return SH.DarkVoid;
+	-- buff
+	if not buff[PR.PowerWordFortitude].up then
+		return PR.PowerWordFortitude;
 	end
 
-	-- mindbender;
-	if talents[SH.Mindbender] and cooldown[SH.Mindbender].ready then
-		return SH.Mindbender;
+	-- Rotation
+	if talents[SH.Damnation] and cooldown[SH.Damnation].ready then
+		return SH.Damnation;
 	end
 
-	-- mind_blast;
-	if talents[SH.ShadowWordVoid] then
-		if (cooldown[SH.ShadowWordVoid].charges >= 2 or
-			cooldown[SH.ShadowWordVoid].charges >= 1 and currentSpell ~= SH.ShadowWordVoid)
-		then
-			return SH.ShadowWordVoid;
-		end
+	if talents[SH.Misery] and not debuff[SH.ShadowWordPain].up and currentSpell ~= SH.VampiricTouch and timeToDie >= 7 then
+		return SH.VampiricTouch;
 	else
-		if cooldown[SH.MindBlast].ready and currentSpell ~= SH.MindBlast then
-			return SH.MindBlast;
+		if not talents[SH.Misery] and not debuff[SH.VampiricTouch].up and timeToDie >= 7 then
+			return SH.VampiricTouch;
 		end
 	end
 
-	-- shadow_crash,if=(raid_event.adds.in>5&raid_event.adds.duration<2)|raid_event.adds.duration>2;
-	if talents[SH.ShadowCrash] and cooldown[SH.ShadowCrash].ready and targets >= 2 then
-		return SH.ShadowCrash;
-	end
-
-	-- shadow_word_pain,target_if=refreshable&target.time_to_die>4,if=!talent.misery.enabled&!talent.dark_void.enabled;
-	if debuff[SH.ShadowWordPain].refreshable and timeToDie > 4 and
-		not talents[SH.Misery] and
-		not talents[SH.DarkVoid]
-	then
+	if not talents[SH.Misery] and not debuff[SH.ShadowWordPain].up and timeToDie >= 5 then
 		return SH.ShadowWordPain;
 	end
 
-	-- vampiric_touch,target_if=refreshable,if=(target.time_to_die>6);
-	if debuff[SH.VampiricTouch].refreshable and currentSpell ~= SH.VampiricTouch and timeToDie > 6 then
-		return SH.VampiricTouch;
+	if insanity >= 40 and cooldown[SH.VoidEruption].remains <= 3 and cooldown[SH.Voidling].ready and
+		not talents[SH.Mindbender] then
+		return SH.Voidling;
+	else
+		if insanity >= 40 and cooldown[SH.VoidEruption].remains <= 3 and cooldown[SH.Shadowfiend].ready and
+			not talents[SH.Mindbender] then
+			return SH.Shadowfiend;
+		end
 	end
 
-	-- vampiric_touch,target_if=dot.shadow_word_pain.refreshable,if=(talent.misery.enabled&target.time_to_die>4);
-	if currentSpell ~= SH.VampiricTouch and talents[SH.Misery] and timeToDie > 4 then
-		return SH.VampiricTouch;
+	if talents[SH.Mindbender] and insanity > 40 and cooldown[SH.VoidEruption].remains <= 3 and
+		cooldown[SH.Mindbender].ready then
+		return SH.Mindbender;
 	end
 
-	-- void_torrent,if=buff.voidform.up;
-	if talents[SH.VoidTorrent] and cooldown[SH.VoidTorrent].ready and (buff[SH.Voidform].up) then
-		return SH.VoidTorrent;
+	if insanity > 40 and cooldown[SH.VoidEruption].ready and not buff[SH.Voidform].up then
+		return SH.VoidEruption;
 	end
 
-	-- mind_sear,target_if=spell_targets.mind_sear>2,chain=1,interrupt=1;
-	if targets > 2 then
-		return SH.MindSear;
+	if talents[SH.Damnation] and cooldown[SH.Damnation].ready then
+		return SH.Damnation;
 	end
 
-	-- mind_flay,chain=1,interrupt_immediate=1,interrupt_if=ticks>=2&(cooldown.void_bolt.up|cooldown.mind_blast.up);
-	return SH.MindFlay;
-end
-
-function Priest:ShadowSingle()
-	local fd = MaxDps.FrameData;
-	local cooldown = fd.cooldown;
-	local buff = fd.buff;
-	local debuff = fd.debuff;
-	local currentSpell = fd.currentSpell;
-	local talents = fd.talents;
-	local timeToDie = fd.timeToDie;
-	local targets = fd.targets;
-	local targetHp = fd.targetHp;
-	local VoidBolt = fd.VoidBolt;
-	local gcd = fd.gcd;
-	local insanity = UnitPower('player', Enum.PowerType.Insanity);
-
-	-- variable,name=dots_up,op=set,value=dot.shadow_word_pain.ticking&dot.vampiric_touch.ticking;
-	local dotsUp = debuff[SH.ShadowWordPain].up and debuff[SH.VampiricTouch].up;
-	local insanityLevel = talents[SH.LegacyOfTheVoid] and 60 or 90;
+	if talents[SH.Misery] and not debuff[SH.ShadowWordPain].up and currentSpell ~= SH.VampiricTouch then
+		return SH.VampiricTouch;
+	end
 
-	-- void_eruption;
-	if not buff[SH.Voidform].up and currentSpell ~= SH.VoidEruption and insanity >= insanityLevel then
-		return SH.VoidEruption;
+	if not talents[SH.Misery] and not debuff[SH.ShadowWordPain].up then
+		return SH.ShadowWordPain;
 	end
 
-	-- dark_ascension,if=buff.voidform.down;
-	if talents[SH.DarkAscension] and cooldown[SH.DarkAscension].ready and not buff[SH.Voidform].up and insanity < 50 then
-		return SH.DarkAscension;
+	if talents[SH.SearingNightmare] and targets >= 3 and insanity >= 35 and debuff[SH.MindSear].up then
+		return SH.SearingNightmare;
+	else
+		if insanity > 50 and not debuff[SH.DevouringPlague].up then
+			return SH.DevouringPlague;
+		end
 	end
 
-	-- void_bolt;
-	if buff[SH.Voidform].up and cooldown[SH.VoidBolt2].remains < 0.25 then
-		return VoidBolt;
+	if talents[SH.UnfurlingDarkness] and buff[SH.UnfurlingDarkness].up then
+		return SH.VampiricTouch;
 	end
 
-	-- shadow_word_death,if=target.time_to_die<3|cooldown.shadow_word_death.charges=2|(cooldown.shadow_word_death.charges=1&cooldown.shadow_word_death.remains<gcd.max);
-	if talents[SH.ShadowWordDeath] and targetHp < 0.2 and (
-		timeToDie < 3 or
-		cooldown[SH.ShadowWordDeath].charges >= 2 or
-		(cooldown[SH.ShadowWordDeath].charges >= 1 and cooldown[SH.ShadowWordDeath].remains < gcd)
-	) then
+	if targetHp <= 20 and cooldown[SH.ShadowWordDeath].ready then
 		return SH.ShadowWordDeath;
 	end
 
-	-- surrender_to_madness,if=buff.voidform.stack>=(15+buff.bloodlust.up)&target.time_to_die>200|target.time_to_die<75;
-	if talents[SH.SurrenderToMadness] and cooldown[SH.SurrenderToMadness].ready and
-		(buff[SH.Voidform].count >= 15 and timeToDie > 200 or timeToDie < 75)
-	then
+	if talents[SH.SurrenderToMadness] and not buff[SH.Voidform].up and timeToDie < 25 then
 		return SH.SurrenderToMadness;
 	end
 
-	-- dark_void,if=raid_event.adds.in>10;
-	if talents[SH.DarkVoid] and cooldown[SH.DarkVoid].ready and currentSpell ~= SH.DarkVoid and targets < 2 then
-		return SH.DarkVoid;
+	if debuff[SH.ShadowWordPain].up and debuff[SH.VampiricTouch].up and talents[SH.VoidTorrent] and
+		cooldown[SH.VoidTorrent].ready and not buff[SH.Voidform].up then
+		return SH.VoidTorrent;
 	end
 
-	-- mindbender;
-	if talents[SH.Mindbender] and cooldown[SH.Mindbender].ready then
-		return SH.Mindbender;
+	if buff[SH.DarkThought].up and currentSpell ~= SH.MindFlay then
+		return SH.MindFlay;
 	end
-
-	-- shadow_word_death,if=!buff.voidform.up|(cooldown.shadow_word_death.charges=2&buff.voidform.stack<15);
-	if talents[SH.ShadowWordDeath] and targetHp < 0.2 and (
-		not buff[SH.Voidform].up or
-		(cooldown[SH.ShadowWordDeath].charges >= 2 and buff[SH.Voidform].count < 15)
-	) then
-		return SH.ShadowWordDeath;
+	if buff[SH.DarkThought].up and currentSpell == SH.MindFlay then
+		return SH.MindBlast;
 	end
 
-	-- shadow_crash,if=raid_event.adds.in>5&raid_event.adds.duration<20;
-	if talents[SH.ShadowCrash] and cooldown[SH.ShadowCrash].ready then
-		return SH.ShadowCrash;
-	end
-
-	-- mind_blast,if=variable.dots_up;
-	if talents[SH.ShadowWordVoid] then
-		if (cooldown[SH.ShadowWordVoid].charges >= 2 or
-			cooldown[SH.ShadowWordVoid].charges >= 1 and currentSpell ~= SH.ShadowWordVoid)
-			and dotsUp
-		then
-			return SH.ShadowWordVoid;
-		end
+	if targets <= 1 then
+		return SH.MindFlay;
 	else
-		if cooldown[SH.MindBlast].ready and currentSpell ~= SH.MindBlast and dotsUp then
-			return SH.MindBlast;
+		if targets >= 2 then
+			return SH.MindSear;
 		end
 	end
-
-	-- void_torrent,if=dot.shadow_word_pain.remains>4&dot.vampiric_touch.remains>4&buff.voidform.up;
-	if talents[SH.VoidTorrent] and cooldown[SH.VoidTorrent].ready and (
-		debuff[SH.ShadowWordPain].remains > 4 and debuff[SH.VampiricTouch].remains > 4 and buff[SH.Voidform].up
-	) then
-		return SH.VoidTorrent;
-	end
-
-	-- shadow_word_pain,if=refreshable&target.time_to_die>4&!talent.misery.enabled&!talent.dark_void.enabled;
-	if debuff[SH.ShadowWordPain].refreshable and timeToDie > 4 and not talents[SH.Misery] and not talents[SH.DarkVoid] then
-		return SH.ShadowWordPain;
-	end
-
-	-- vampiric_touch,if=refreshable&target.time_to_die>6|(talent.misery.enabled&dot.shadow_word_pain.refreshable);
-	if currentSpell ~= SH.VampiricTouch and (
-		debuff[SH.VampiricTouch].refreshable and timeToDie > 6 or
-		(talents[SH.Misery] and debuff[SH.ShadowWordPain].refreshable)
-	) then
-		return SH.VampiricTouch;
-	end
-
-	-- mind_flay,chain=1,interrupt_immediate=1,interrupt_if=ticks>=2&(cooldown.void_bolt.up|cooldown.mind_blast.up);
-	return SH.MindFlay;
 end
-