diff --git a/Vect.lua b/Vect.lua
index dcee7ce..b7440fe 100644
--- a/Vect.lua
+++ b/Vect.lua
@@ -1,7 +1,14 @@
 
 --TODOS:
---spec detection
 --Way to show pet cds on the master -> currently looks impossible
+--dr cleanup (PLAYER ENTER WORLD)
+--Option to show pet cds on possible master (eg spell lock on all locks)
+--interrupts first option (or last or don't care), or better -> rank system v
+--3 option -> interrupt, stun, gap closers, strong nukes, the user can select which is first
+--mana gem, fap
+--support for rows
+
+--Message: ...nfig-3.0\AceConfigDialog-3.0\AceConfigDialog-3.0.lua:20: Cannot find a library instance of "AceGUI-3.0".
 
 --"Globals"
 local aceDB = LibStub("AceDB-3.0");
@@ -235,9 +242,11 @@ function Vect:PLAYER_ENTERING_WORLD()
 	local t = GetTime();
 	for k, v in pairs(Vect.cds) do
 		for i, j in pairs(v) do
-			if j[2] < t then
-				--self:Print(Vect.cds[k][i][4]);
-				Vect.cds[k][i] = nil;
+			if not (i == "spec") then
+				if j[2] < t then
+					--self:Print(Vect.cds[k][i][4]);
+					Vect.cds[k][i] = nil;
+				end
 			end
 		end
 	end
diff --git a/data/cooldowns.lua b/data/cooldowns.lua
index 79df09c..4418cbc 100644
--- a/data/cooldowns.lua
+++ b/data/cooldowns.lua
@@ -41,8 +41,34 @@ function Vect:AddCd(srcGUID, spellID)
 	local db =  Vect.db.profile;
 	if not db["enabled"] then return end;
 	
-	if not Vect.cds[srcGUID] then Vect.cds[srcGUID] = {} end
-	local cd, reset = Vect.spells[spellID][1], Vect.spells[spellID][2];
+	if not Vect.cds[srcGUID] then 
+		Vect.cds[srcGUID] = {}
+		Vect.cds[srcGUID]["spec"] = 1;
+	end
+	
+	local specchange = false;
+	if db["specdetection"] then
+		if Vect:DetectSpec(srcGUID, spellID) then
+			specchange = true;
+		end
+	end
+	
+	local spec = Vect.cds[srcGUID]["spec"];
+	local cd, reset = Vect.spells[spellID][spec], Vect.spells[spellID][2];
+	
+	if specchange and (not cd) then
+		if self.targets["target"] == srcGUID then
+			self:ReassignCds("target");
+		end
+		
+		if self.targets["focus"] == srcGUID then
+			self:ReassignCds("focus");
+		end
+	end
+	
+	--means spec detection spell
+	if not cd then return end;
+	
 	local spellName, spellRank, spellIcon = GetSpellInfo(spellID);
 	local currentTime = GetTime();
 	local endTime = currentTime + cd;
@@ -72,13 +98,36 @@ function Vect:AddCd(srcGUID, spellID)
 	end
 end
 
+function Vect:DetectSpec(srcGUID, spellID)
+	local spec = Vect.spells[spellID][6];
+	
+	if spec == 0 then return false end;
+	if Vect.cds[srcGUID]["spec"] == spec then return false end;
+	--self:Print("spec found: " .. spec);
+	Vect:RemapSpecCDs(srcGUID, spec);
+	return true;
+end
+
+function Vect:RemapSpecCDs(srcGUID, spec)
+	if not self.cds[srcGUID] then return end
+	for k, v in pairs(self.cds[srcGUID]) do
+		if not (k == "spec") then
+			local cd = Vect.spells[v[5]][spec];
+			v[3] = cd;
+			v[2] = v[1] + cd;
+		end
+	end
+end
+
 function Vect:CdRemoval(srcGUID, resetArray)
 	if not self.cds[srcGUID] then return end
 	for k, v in pairs(self.cds[srcGUID]) do
-		for j, x in pairs(resetArray) do
-			if v[5] == x then
-				--self:Print("Removed cd: " .. v[5]);
-				self.cds[srcGUID][v[5]] = nil;
+		if not (k == "spec") then
+			for j, x in pairs(resetArray) do
+				if v[5] == x then
+					--self:Print("Removed cd: " .. v[5]);
+					self.cds[srcGUID][v[5]] = nil;
+				end
 			end
 		end
 	end
@@ -91,17 +140,19 @@ function Vect:SortCDs(which)
 	--make the tmp table
 	local i = 1;
 	for k, v in pairs(self.cds[self.targets[which]]) do
-		tmp[i] = {
-			currentTime = v[1],
-			endTime = v[2],
-			cd = v[3],
-			spellIcon = v[4],
-			spellID = v[5]
-			};
-			
-		--self:Print(v[1] .. v[2] .. v[3] .. v[4] .. v[5])
-		--self:Print(tmp[i]["currentTime"] .. " " .. tmp[i]["endTime"] .. " " .. tmp[i]["cd"] .. " " .. tmp[i][4] .. " " .. tmp[i][5])
-		i = i + 1;
+		if not (k == "spec") then
+			tmp[i] = {
+				currentTime = v[1],
+				endTime = v[2],
+				cd = v[3],
+				spellIcon = v[4],
+				spellID = v[5]
+				};
+				
+			--self:Print(v[1] .. v[2] .. v[3] .. v[4] .. v[5])
+			--self:Print(tmp[i]["currentTime"] .. " " .. tmp[i]["endTime"] .. " " .. tmp[i]["cd"]);-- .. " " .. tmp[i][4] .. " " .. tmp[i][5])
+			i = i + 1;
+		end
 	end
 
 	if not tmp then return end;
@@ -185,12 +236,14 @@ function Vect:VOnTimerUpdate(which)
 	local t = GetTime();
 	--let's check if one of the cooldowns finished
 	for k, v in pairs(self.cds[self.targets[which]]) do
-		if v[2] <= t then
-			self.cds[self.targets[which]][v[5]] = nil;
-			--we have to update both, because if somebody is targeted and focused since sorting is 
-			--implemented it triggers only one update, probably it had bugs before too, but got unnoticed
-			self:ReassignCds("target");
-			self:ReassignCds("focus");
+		if not (k == "spec") then
+			if v[2] <= t then
+				self.cds[self.targets[which]][v[5]] = nil;
+				--we have to update both, because if somebody is targeted and focused since sorting is 
+				--implemented it triggers only one update, probably it had bugs before too, but got unnoticed
+				self:ReassignCds("target");
+				self:ReassignCds("focus");
+			end
 		end
 	end
 end
diff --git a/data/global.lua b/data/global.lua
index 5e505d8..c1df1dd 100644
--- a/data/global.lua
+++ b/data/global.lua
@@ -2,7 +2,7 @@
 Vect = LibStub("AceAddon-3.0"):NewAddon("Vect", "AceConsole-3.0", "AceEvent-3.0")
 Vect.appName = "Vect"
 Vect.dbName = "VectDB"
-Vect.version = "0.1"
+Vect.version = "0.9"
 
 function Vect:HideFrames()
 	for i = 1, 23 do
diff --git a/data/spells.lua b/data/spells.lua
index 827ea0f..d28655d 100644
--- a/data/spells.lua
+++ b/data/spells.lua
@@ -1,430 +1,575 @@
 
 Vect.spells = {
 	--Trinkets
-	[42292] = {120, nil}, --PvP Trinket
+	[42292] = {120, nil, 120, 120, 120, 0}, --PvP Trinket
 	--Other Stuff
-	[54861] = {180, nil}, --Rocket Boots (Enchant)
+	[54861] = {180, nil, 180, 180, 180, 0}, --Rocket Boots (Enchant)
 	--Racials (War Stomp no combatlog entry)
-	[59752] = {120, nil}, --Every Man For Himself
-	[7744] = {120, nil}, --Will of the Forsaken
-	[25046] = {120, nil}, --Arcane Torrent (Energy Version)
-	[28730] = {120, nil}, --Arcane Torrent (Mana version)
-	[50613] = {120, nil}, --Arcane Torrent (Runic Power version)
-	[28730] = {120, nil}, --Arcane Torrent (Heroes Warrior)
-	[65116] = {120, nil}, --Stoneform
-	[58984] = {120, nil}, --Shadowmeld
-	[20589] = {105, nil}, --Escape Artist
-	[28880] = {180, nil}, --Gift of the Naaru
+	[59752] = {120, nil, 120, 120, 120, 0}, --Every Man For Himself
+	[7744] = {120, nil, 120, 120, 120, 0}, --Will of the Forsaken
+	[25046] = {120, nil, 120, 120, 120, 0}, --Arcane Torrent (Energy Version)
+	[28730] = {120, nil, 120, 120, 120, 0}, --Arcane Torrent (Mana version)
+	[50613] = {120, nil, 120, 120, 120, 0}, --Arcane Torrent (Runic Power version)
+	[28730] = {120, nil, 120, 120, 120, 0}, --Arcane Torrent (Heroes Warrior)
+	[65116] = {120, nil, 120, 120, 120, 0}, --Stoneform
+	[58984] = {120, nil, 120, 120, 120, 0}, --Shadowmeld
+	[20589] = {105, nil, 105, 105, 105, 0}, --Escape Artist
+	[28880] = {180, nil, 180, 180, 180, 0}, --Gift of the Naaru
+	
 	--Warrior
 	--Total: 20
 	--Arms
-	[46924] = {90, nil}, --BladeStrom
-	[100] = {15, nil}, --Charge rank 1
-	[6178] = {15, nil}, --Charge rank 2
-	[11578] = {15, nil}, --Charge rank 3
-	[57755] = {60, nil}, --Heroic Throw
-	[20230] = {240, nil}, --Retaliation
-	[64382] = {300, nil}, --Shattering Throw
-	[12328] = {30, nil}, --Sweeping Strikes
+	[46924] = {90, nil, 90, 90, 90, 3}, --BladeStrom
+	[100] = {15, nil, 20, 15, 15, 0}, --Charge rank 1
+	[6178] = {15, nil, 20, 15, 15, 0}, --Charge rank 2
+	[11578] = {15, nil, 20, 15, 15, 0}, --Charge rank 3
+	[57755] = {60, nil, 60, 60, 60, 0}, --Heroic Throw
+	[20230] = {240, nil, 300, 300, 240, 0}, --Retaliation
+	[64382] = {300, nil, 300, 300, 300, 0}, --Shattering Throw
+	[12328] = {30, nil, 30, 30, 30, 3}, --Sweeping Strikes
+	--Detection
+	[12294] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r1
+	[21551] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r2
+	[21552] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r3
+	[21553] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r4
+	[25248] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r5
+	[30330] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r6
+	[47485] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r7
+	[47486] = {0, nil, 0, 0, 0, 3}, --Mortal Strike r8
 	--Fury
-	[12292] = {121, nil}, --Death Wish
-	[55694] = {180, nil}, --Enraged Regeneration
-	[60970] = {45, nil}, --Heroic Fury
-	[20252] = {20, nil}, --Intercept
-	[5246] = {120, nil}, --Intimidating Shout
-	[6552] = {10, nil}, --Pummel
-	[1719] = {161, nil}, --Recklessness
+	[18499] = {20.1, nil, 30, 20.1, 30, 0}, --Berserker Rage
+	[12292] = {121, nil, 121, 121, 121, 4}, --Death Wish
+	[55694] = {180, nil, 180, 180, 180, 0}, --Enraged Regeneration
+	[60970] = {45, nil, 45, 45, 45, 4}, --Heroic Fury
+	[20252] = {20, nil, 30, 20, 30, 0}, --Intercept
+	[5246] = {120, nil, 120, 120, 120, 0}, --Intimidating Shout
+	[6552] = {10, nil, 10, 10, 10, 0}, --Pummel
+	[1719] = {161, nil, 300, 210, 240, 0}, --Recklessness
+	--Detection
+	[23881] = {0, nil, 0, 0, 0, 4}, --Bloodthirst
 	--Protection
-	[12809] = {30, nil}, --Concussion Blow
-	[676] = {40, nil}, --Disarm
-	[3411] = {30, nil}, --Intervene
-	[12975] = {180, nil}, --Last Stand
-	[72] = {12, nil}, --Shield Bash
-	[871] = {240, nil}, --Shield Wall
-	[46968] = {20, nil}, --Shockwave
-	[23920] = {10, nil}, --Spell Reflection
+	[12809] = {30, nil, 30, 30, 30, 5}, --Concussion Blow
+	[676] = {40, nil, 60, 60, 60, 0}, --Disarm
+	[3411] = {30, nil, 30, 30, 30, 0}, --Intervene
+	[12975] = {180, nil, 180, 180, 180, 0}, --Last Stand
+	[72] = {12, nil, 12, 12, 12, 0}, --Shield Bash
+	[871] = {240, nil, 300, 300, 240, 0}, --Shield Wall
+	[46968] = {20, nil, 20, 20, 20, 5}, --Shockwave
+	[23920] = {10, nil, 10, 10, 10, 0}, --Spell Reflection
+	--Detection
+	[20243] = {0, nil, 0, 0, 0, 5}, --Devastate r1
+	[30016] = {0, nil, 0, 0, 0, 5}, --Devastate r2
+	[30022] = {0, nil, 0, 0, 0, 5}, --Devastate r3
+	[47497] = {0, nil, 0, 0, 0, 5}, --Devastate r4
+	[47498] = {0, nil, 0, 0, 0, 5}, --Devastate r5
+	[50720] = {0, nil, 0, 0, 0, 5}, --Vigilance
 	
 	--Paladin
 	--Total: 16
 	--Holy
-	[31821] = {120, nil}, --Aura Mastery
-	[20216] = {120, nil}, --Divine Favor
-	[31842] = {180, nil}, --Divine Illumination
-	[54428] = {60, nil}, --Divine Plea
-	[2812] = {20, nil}, --Holy Wrath r1
-	[10318] = {20, nil}, --Holy Wrath r2
-	[27139] = {20, nil}, --Holy Wrath r3
-	[48816] = {20, nil}, --Holy Wrath r4
-	[48817] = {20, nil}, --Holy Wrath r5
-	[633] = {960, nil}, --Lay on Hands r1
-	[2800] = {960, nil}, --Lay on Hands r2
-	[10310] = {960, nil}, --Lay on Hands r3
-	[27154] = {960, nil}, --Lay on Hands r4
-	[48788] = {960, nil}, --Lay on Hands r5
+	[31821] = {120, nil, 120, 120, 120, 0}, --Aura Mastery
+	[20216] = {120, nil, 120, 120, 120, 3}, --Divine Favor
+	[31842] = {180, nil, 180, 180, 180, 3}, --Divine Illumination
+	[54428] = {60, nil, 60, 60, 60, 0}, --Divine Plea
+	[2812] = {20, nil, 20, 20, 20, 0}, --Holy Wrath r1
+	[10318] = {20, nil, 20, 20, 20, 0}, --Holy Wrath r2
+	[27139] = {20, nil, 20, 20, 20, 0}, --Holy Wrath r3
+	[48816] = {20, nil, 20, 20, 20, 0}, --Holy Wrath r4
+	[48817] = {20, nil, 20, 20, 20, 0}, --Holy Wrath r5
+	[633] = {960, nil, 900, 900, 900, 0}, --Lay on Hands r1
+	[2800] = {960, nil, 900, 900, 900, 0}, --Lay on Hands r2
+	[10310] = {960, nil, 900, 900, 900, 0}, --Lay on Hands r3
+	[27154] = {960, nil, 900, 900, 900, 0}, --Lay on Hands r4
+	[48788] = {960, nil, 900, 900, 900, 0}, --Lay on Hands r5
+	--Detection
+	[20473] = {0, nil, 0, 0, 0, 3}, --Holy Shock r1
+	[20929] = {0, nil, 0, 0, 0, 3}, --Holy Shock r2
+	[20930] = {0, nil, 0, 0, 0, 3}, --Holy Shock r3
+	[27174] = {0, nil, 0, 0, 0, 3}, --Holy Shock r4
+	[33072] = {0, nil, 0, 0, 0, 3}, --Holy Shock r5
+	[48824] = {0, nil, 0, 0, 0, 3}, --Holy Shock r6
+	[48825] = {0, nil, 0, 0, 0, 3}, --Holy Shock r7
+	[53563] = {0, nil, 0, 0, 0, 3}, --Beacon of Light
 	--Protection
-	[31935] = {30, nil}, --Avenger's Shield r1
-	[32699] = {30, nil}, --Avenger's Shield r2
-	[32700] = {30, nil}, --Avenger's Shield r3
-	[48826] = {30, nil}, --Avenger's Shield r4
-	[48827] = {30, nil}, --Avenger's Shield r5
-	[498] = {120, nil}, --Divine Protection
-	[64205] = {120, nil}, --Divine Sacrifice
-	[642] = {240, nil}, --Divine Shield
-	[853] = {30, nil}, --Hammer of justice r1
-	[5588] = {30, nil}, --Hammer of justice r2
-	[5589] = {30, nil}, --Hammer of justice r3
-	[10308] = {30, nil}, --Hammer of justice r4
-	[1044] = {25, nil}, --Hand of Freedom
-	[1022] = {180, nil}, --Hand of Protection r1
-	[5599] = {180, nil}, --Hand of Protection r2
-	[10278] = {180, nil}, --Hand of Protection r3
-	[6940] = {120, nil}, --Hand of Sacrifice
+	[31935] = {30, nil, 30, 30, 30, 4}, --Avenger's Shield r1
+	[32699] = {30, nil, 30, 30, 30, 4}, --Avenger's Shield r2
+	[32700] = {30, nil, 30, 30, 30, 4}, --Avenger's Shield r3
+	[48826] = {30, nil, 30, 30, 30, 4}, --Avenger's Shield r4
+	[48827] = {30, nil, 30, 30, 30, 4}, --Avenger's Shield r5
+	[498] = {120, nil, 180, 120, 180, 0}, --Divine Protection
+	[64205] = {120, nil, 120, 120, 120, 0}, --Divine Sacrifice
+	[642] = {240, nil, 300, 240, 300, 0}, --Divine Shield
+	[853] = {30, nil, 40, 30, 40, 0}, --Hammer of justice r1
+	[5588] = {30, nil, 40, 30, 40, 0}, --Hammer of justice r2
+	[5589] = {30, nil, 40, 30, 40, 0}, --Hammer of justice r3
+	[10308] = {30, nil, 40, 30, 40, 0}, --Hammer of justice r4
+	[1044] = {25, nil, 25, 25, 25, 0}, --Hand of Freedom
+	[1022] = {180, nil, 180, 180, 180, 0}, --Hand of Protection r1
+	[5599] = {180, nil, 180, 180, 180, 0}, --Hand of Protection r2
+	[10278] = {180, nil, 180, 180, 180, 0}, --Hand of Protection r3
+	[6940] = {120, nil, 120, 120, 120, 0}, --Hand of Sacrifice
 	--Retribution
-	[31884] = {120, nil}, --Avenging Wrath
-	[20066] = {60, nil}, --Repentance
+	[31884] = {120, nil, 180, 180, 120, 0}, --Avenging Wrath
+	[20066] = {60, nil, 60, 60, 60, 5}, --Repentance
 	
 	--Hunter
 	--Total: 15
 	--Feign Death No Combat log entry
 	--Pet
-	[53480] = {42, nil}, --Roar of Sacrifice
+	[53480] = {42, nil, 42, 42, 42, 0}, --Roar of Sacrifice
 	--Beast Mastery
-	[19574] = {84, nil}, --Bestial Wrath
-	[19577] = {42, nil}, --Intimidation
-	[53271] = {60, nil}, --Master's Call
-	[14327] = {30, nil}, --Scare Beast
+	[19574] = {84, nil, 84, 84, 84, 3}, --Bestial Wrath
+	[19577] = {42, nil, 42, 42, 42, 3}, --Intimidation
+	[53271] = {60, nil, 60, 60, 60, 0}, --Master's Call
+	[14327] = {30, nil, 30, 30, 30, 0}, --Scare Beast
 	--Marksman
-	[1543] = {20, nil}, --Flare
-	[3045] = {180, nil}, --Rapid Fire
+	[1543] = {20, nil, 20, 20, 20, 0}, --Flare
+	[3045] = {180, nil, 300, 300, 300, 0}, --Rapid Fire
 	[23989] = {180, 
 		{19577,53271,14327, 1543,3045,34490,3674,63668,63669,
 		63670,63671,63672,19263,781,13813,14316,14317,
 		27025,49066,49067,60192,1499,14310,14311,13809,
 		13795,14302,14303,14304,14305,27023,49055,49056,
-		19503,34600,19386,24132,24133,27068,49011,49012}}, --Readiness
-	[34490] = {20, nil}, --Silencing Shot
+		19503,34600,19386,24132,24133,27068,49011,49012}, 180, 180, 180, 4}, --Readiness
+	[34490] = {20, nil, 20, 20, 20, 4}, --Silencing Shot
+	--Detection
+	[53209] = {0, nil, 0, 0, 0, 4}, --Chimera Shot
 	--Survival
-	[3674] = {24, nil}, --Black Arrow r1
-	[63668] = {24, nil}, --Black Arrow r2
-	[63669] = {24, nil}, --Black Arrow r3
-	[63670] = {24, nil}, --Black Arrow r4
-	[63671] = {24, nil}, --Black Arrow r5
-	[63672] = {24, nil}, --Black Arrow r6
-	[19263] = {90, nil}, --Deterrence
-	[781] = {16, nil}, --Disengage
-	[13813] = {24, nil}, --Explosive Trap r1
-	[14316] = {24, nil}, --Explosive Trap r2
-	[14317] = {24, nil}, --Explosive Trap r3
-	[27025] = {24, nil}, --Explosive Trap r4
-	[49066] = {24, nil}, --Explosive Trap r5
-	[49067] = {24, nil}, --Explosive Trap r6
+	[3674] = {24, nil, 24, 24, 24, 5}, --Black Arrow r1
+	[63668] = {24, nil, 24, 24, 24, 5}, --Black Arrow r2
+	[63669] = {24, nil, 24, 24, 24, 5}, --Black Arrow r3
+	[63670] = {24, nil, 24, 24, 24, 5}, --Black Arrow r4
+	[63671] = {24, nil, 24, 24, 24, 5}, --Black Arrow r5
+	[63672] = {24, nil, 24, 24, 24, 5}, --Black Arrow r6
+	[19263] = {90, nil, 90, 90, 90, 0}, --Deterrence
+	[781] = {16, nil, 20, 16, 16, 0}, --Disengage
+	[13813] = {24, nil, 30, 30, 24, 0}, --Explosive Trap r1
+	[14316] = {24, nil, 30, 30, 24, 0}, --Explosive Trap r2
+	[14317] = {24, nil, 30, 30, 24, 0}, --Explosive Trap r3
+	[27025] = {24, nil, 30, 30, 24, 0}, --Explosive Trap r4
+	[49066] = {24, nil, 30, 30, 24, 0}, --Explosive Trap r5
+	[49067] = {24, nil, 30, 30, 24, 0}, --Explosive Trap r6
 	--Feign Death
-	[60192] = {24, nil}, --Freezing Arrow
-	[1499] = {24, nil}, --Freezing Trap r1
-	[14310] = {24, nil}, --Freezing Trap r2
-	[14311] = {24, nil}, --Freezing Trap r3
-	[13809] = {24, nil}, --Frost Trap
-	[13795] = {24, nil}, --Immolation Trap r1
-	[14302] = {24, nil}, --Immolation Trap r2
-	[14303] = {24, nil}, --Immolation Trap r3
-	[14304] = {24, nil}, --Immolation Trap r4
-	[14305] = {24, nil}, --Immolation Trap r5
-	[27023] = {24, nil}, --Immolation Trap r6
-	[49055] = {24, nil}, --Immolation Trap r7
-	[49056] = {24, nil}, --Immolation Trap r8
-	[19503] = {30, nil}, --Scatter Shot
-	[34600] = {24, nil}, --Snake Trap
-	[19386] = {60, nil}, --Wyvern Sting r1
-	[24132] = {60, nil}, --Wyvern Sting r2
-	[24133] = {60, nil}, --Wyvern Sting r3
-	[27068] = {60, nil}, --Wyvern Sting r4
-	[49011] = {60, nil}, --Wyvern Sting r5
-	[49012] = {60, nil}, --Wyvern Sting r6
+	[60192] = {24, nil, 30, 30, 24, 0}, --Freezing Arrow
+	[1499] = {24, nil, 30, 30, 24, 0}, --Freezing Trap r1
+	[14310] = {24, nil, 30, 30, 24, 0}, --Freezing Trap r2
+	[14311] = {24, nil, 30, 30, 24, 0}, --Freezing Trap r3
+	[13809] = {24, nil, 30, 30, 24, 0}, --Frost Trap
+	[13795] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r1
+	[14302] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r2
+	[14303] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r3
+	[14304] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r4
+	[14305] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r5
+	[27023] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r6
+	[49055] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r7
+	[49056] = {24, nil, 30, 30, 24, 0}, --Immolation Trap r8
+	[19503] = {30, nil, 30, 30, 30, 0}, --Scatter Shot
+	[34600] = {24, nil, 30, 30, 24, 0}, --Snake Trap
+	[19386] = {60, nil, 60, 60, 60, 5}, --Wyvern Sting r1
+	[24132] = {60, nil, 60, 60, 60, 5}, --Wyvern Sting r2
+	[24133] = {60, nil, 60, 60, 60, 5}, --Wyvern Sting r3
+	[27068] = {60, nil, 60, 60, 60, 5}, --Wyvern Sting r4
+	[49011] = {60, nil, 60, 60, 60, 5}, --Wyvern Sting r5
+	[49012] = {60, nil, 60, 60, 60, 5}, --Wyvern Sting r6
+	--Detection
+	[53301] = {0, nil, 0, 0, 0, 5}, --Explosive Shot r1
+	[60051] = {0, nil, 0, 0, 0, 5}, --Explosive Shot r2
+	[60052] = {0, nil, 0, 0, 0, 5}, --Explosive Shot r3
+	[60053] = {0, nil, 0, 0, 0, 5}, --Explosive Shot r4
 	
 	--Rogue
 	--Total: 15
 	--Assassination
-	[14177] = {180, nil}, --Cold Blood
-	[51722] = {60, nil}, --Dismantle
-	[408] = {20, nil}, --Kidney Shot r1
-	[8643] = {20, nil}, --Kidney Shot r2
+	[14177] = {180, nil, 180, 180, 180, 3}, --Cold Blood
+	[51722] = {60, nil, 60, 60, 60, 0}, --Dismantle
+	[408] = {20, nil, 20, 20, 20, 0}, --Kidney Shot r1
+	[8643] = {20, nil, 20, 20, 20, 0}, --Kidney Shot r2
+	--detect
+	[51662] = {0, nil, 0, 0, 0, 3}, --Hunger for Blood
+	[1329] = {0, nil, 0, 0, 0, 3}, --Mutilate r1
+	[34411] = {0, nil, 0, 0, 0, 3}, --Mutilate r2
+	[34412] = {0, nil, 0, 0, 0, 3}, --Mutilate r3
+	[34413] = {0, nil, 0, 0, 0, 3}, --Mutilate r4
+	[48663] = {0, nil, 0, 0, 0, 3}, --Mutilate r5
+	[48666] = {0, nil, 0, 0, 0, 3}, --Mutilate r6
 	--Combat
-	[13750] = {180, nil}, --Adrenaline Rush
-	[13877] = {120, nil}, --Blade Flurry
-	[5277] = {120, nil}, --Evasion r1
-	[26669] = {120, nil}, --Evasion r2
-	[1766] = {10, nil}, --Kick
-	[51690] = {120, nil}, --Killing Spree
-	[2983] = {120, nil}, --Sprint r1
-	[8696] = {120, nil}, --Sprint r2
-	[11305] = {120, nil}, --Sprint r3
+	[13750] = {180, nil, 180, 180, 180, 4}, --Adrenaline Rush
+	[13877] = {120, nil, 120, 120, 120, 4}, --Blade Flurry
+	[5277] = {120, nil, 180, 120, 180, 0}, --Evasion r1
+	[26669] = {120, nil, 180, 120, 180, 0}, --Evasion r2
+	[1766] = {10, nil, 10, 10, 10, 0}, --Kick
+	[51690] = {120, nil, 120, 120, 120, 4}, --Killing Spree
+	[2983] = {120, nil, 180, 120, 180, 0}, --Sprint r1
+	[8696] = {120, nil, 180, 120, 180, 0}, --Sprint r2
+	[11305] = {120, nil, 180, 120, 180, 0}, --Sprint r3
 	--Subtlety
-	[2094] = {120, nil}, --Blind
-	[31224] = {60, nil}, --Cloak of Shadows
-	[14185] = {300, {5277, 26669, 2983, 8696, 11305, 1856, 1857, 26889, 14177, 36554}}, --Preparation
-	[51713] = {60, nil}, --Shadow Dance
-	[36554] = {20, nil}, --Shadowstep
-	[1856] = {120, nil}, --Vanish r1
-	[1857] = {120, nil}, --Vanish r2
-	[26889] = {120, nil}, --Vanish r3
+	[2094] = {120, nil, 120, 120, 120, 0}, --Blind
+	[31224] = {60, nil, 60, 60, 60, 0}, --Cloak of Shadows
+	[14185] = {300, {5277, 26669, 2983, 8696, 11305, 1856, 1857, 26889, 14177, 36554}, 480, 480, 300, 0}, --Preparation
+	[51713] = {60, nil, 60, 60, 60, 5}, --Shadow Dance
+	[36554] = {20, nil, 30, 30, 20, 5}, --Shadowstep
+	[1856] = {120, nil, 120, 120, 120, 0}, --Vanish r1
+	[1857] = {120, nil, 120, 120, 120, 0}, --Vanish r2
+	[26889] = {120, nil, 120, 120, 120, 0}, --Vanish r3
 
 	--Priest
 	--Total: 14
 	--Discipline
-	[6346] = {180, nil}, --Fear Ward
-	[14751] = {144, nil}, --Inner Focus
-	[33206] = {144, nil}, --Pain Supression
-	[10060] = {96, nil}, --Power infusion
-	[17] = {15, nil}, --Power Word: Shield r1
-	[592] = {15, nil}, --Power Word: Shield r2
-	[600] = {15, nil}, --Power Word: Shield r3
-	[3747] = {15, nil}, --Power Word: Shield r4
-	[6065] = {15, nil}, --Power Word: Shield r5
-	[6066] = {15, nil}, --Power Word: Shield r6
-	[10898] = {15, nil}, --Power Word: Shield r7
-	[10899] = {15, nil}, --Power Word: Shield r8
-	[10900] = {15, nil}, --Power Word: Shield r9
-	[10901] = {15, nil}, --Power Word: Shield r10
-	[25217] = {15, nil}, --Power Word: Shield r11
-	[25218] = {15, nil}, --Power Word: Shield r12
-	[48065] = {15, nil}, --Power Word: Shield r13
-	[48066] = {15, nil}, --Power Word: Shield r14
+	[6346] = {180, nil, 180, 180, 180, 0}, --Fear Ward
+	[14751] = {144, nil, 144, 180, 180, 0}, --Inner Focus
+	[33206] = {144, nil, 144, 144, 144, 3}, --Pain Supression
+	[10060] = {96, nil, 96, 96, 96, 3}, --Power infusion
+	[17] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r1
+	[592] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r2
+	[600] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r3
+	[3747] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r4
+	[6065] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r5
+	[6066] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r6
+	[10898] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r7
+	[10899] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r8
+	[10900] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r9
+	[10901] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r10
+	[25217] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r11
+	[25218] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r12
+	[48065] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r13
+	[48066] = {15, nil, 15, 15, 15, 0}, --Power Word: Shield r14
+	--Detection
+	--Penance no combatlog event
 	--Holy
-	[19203] = {120, nil}, --Desperate Prayer r1
-	[19238] = {120, nil}, --Desperate Prayer r2
-	[19240] = {120, nil}, --Desperate Prayer r3
-	[19241] = {120, nil}, --Desperate Prayer r4
-	[19242] = {120, nil}, --Desperate Prayer r5
-	[19243] = {120, nil}, --Desperate Prayer r6
-	[25437] = {120, nil}, --Desperate Prayer r7
-	[48172] = {120, nil}, --Desperate Prayer r8
-	[48173] = {120, nil}, --Desperate Prayer r9
-	[64843] = {480, nil}, --Divine Hymn
-	[47788] = {180, nil}, --Guardian Spirit
-	[64901] = {360, nil}, --Hymn of Hope
+	[19203] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r1
+	[19238] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r2
+	[19240] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r3
+	[19241] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r4
+	[19242] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r5
+	[19243] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r6
+	[25437] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r7
+	[48172] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r8
+	[48173] = {120, nil, 120, 120, 120, 0}, --Desperate Prayer r9
+	[64843] = {480, nil, 480, 480, 480, 0}, --Divine Hymn
+	[47788] = {180, nil, 180, 180, 180, 4}, --Guardian Spirit
+	[64901] = {360, nil, 360, 360, 360, 0}, --Hymn of Hope
+	--Detection
+	--Lightwell no combatlog entry
+	[34861] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r1
+	[34863] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r2
+	[34864] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r3
+	[34865] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r4
+	[34866] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r5
+	[48088] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r6
+	[48089] = {0, nil, 0, 0, 0, 4}, --Circle of Healing r7
 	--Shadow
-	[47585] = {75, nil}, --Dispersion
-	[586] = {24, nil}, --Fade
-	[64044] = {120, nil}, --Psychic Horror
-	[8122] = {26, nil}, --Psychic Scream r1
-	[8124] = {26, nil}, --Psychic Scream r2
-	[10888] = {26, nil}, --Psychic Scream r3
-	[10890] = {26, nil}, --Psychic Scream r4
-	[34433] = {180, nil}, --Shadowfiend
-	[15487] = {45, nil}, --Silence
-
+	[47585] = {75, nil, 75, 75, 75, 5}, --Dispersion
+	[586] = {24, nil, 30, 30, 24, 0}, --Fade
+	[64044] = {120, nil, 120, 120, 120, 5}, --Psychic Horror
+	[8122] = {26, nil, 30, 30, 24, 0}, --Psychic Scream r1
+	[8124] = {26, nil, 30, 30, 24, 0}, --Psychic Scream r2
+	[10888] = {26, nil, 30, 30, 24, 0}, --Psychic Scream r3
+	[10890] = {26, nil, 30, 30, 24, 0}, --Psychic Scream r4
+	[34433] = {180, nil, 180, 180, 180, 0}, --Shadowfiend
+	[15487] = {45, nil, 45, 45, 45, 5}, --Silence
+	--Detection
+	[15473] = {0, nil, 0, 0, 0, 5}, --Shadowform
+	[15286] = {0, nil, 0, 0, 0, 5}, --Vampiric Embrace
+	[34914] = {0, nil, 0, 0, 0, 5}, --Vampiric Touch r1
+	[34916] = {0, nil, 0, 0, 0, 5}, --Vampiric Touch r2
+	[34917] = {0, nil, 0, 0, 0, 5}, --Vampiric Touch r3
+	[48159] = {0, nil, 0, 0, 0, 5}, --Vampiric Touch r4
+	[48160] = {0, nil, 0, 0, 0, 5}, --Vampiric Touch r5
+	
 	--Death Knight
 	--Total: 18
 	--Blood
-	[49028] = {90, nil}, --Dancing Rune Weapon
-	[48743] = {120, nil}, --Death Pact
-	[49016] = {180, nil}, --Hysteria
-	[49005] = {180, nil}, --Mark of Blood
-	[48982] = {30, nil}, --Rune Tap
-	[47476] = {120, nil}, --Strangulate
-	[55233] = {60, nil}, --Vampiric Blood
+	[49028] = {90, nil, 90, 90, 90, 3}, --Dancing Rune Weapon
+	[48743] = {120, nil, 120, 120, 120, 0}, --Death Pact
+	[49016] = {180, nil, 180, 180, 180, 3}, --Hysteria
+	[49005] = {180, nil, 180, 180, 180, 3}, --Mark of Blood
+	[48982] = {30, nil, 30, 60, 60, 0}, --Rune Tap
+	[47476] = {120, nil, 120, 120, 120, 0}, --Strangulate
+	[55233] = {60, nil, 60, 60, 60, 3}, --Vampiric Blood
+	--Detection
+	[55050] = {0, nil, 0, 0, 0, 3}, --Heart Strike r1
+	[55258] = {0, nil, 0, 0, 0, 3}, --Heart Strike r2
+	[55259] = {0, nil, 0, 0, 0, 3}, --Heart Strike r3
+	[55260] = {0, nil, 0, 0, 0, 3}, --Heart Strike r4
+	[55261] = {0, nil, 0, 0, 0, 3}, --Heart Strike r5
+	[55262] = {0, nil, 0, 0, 0, 3}, --Heart Strike r6
 	--Frost
-	[47568] = {300, nil}, --Empower Rune Weapon
-	[49203] = {60, nil}, --Hungering Cold
-	[48792] = {120, nil}, --Icebound Fortitude
-	[49039] = {120, nil}, --Lichborne
-	[47528] = {10, nil}, --Mind Freeze
-	[51271] = {60, nil}, --Unbreakable Armor
+	[49796] = {120, nil, 120, 120, 120, 4}, --Unbreakable Armor
+	[47568] = {300, nil, 300, 300, 300, 0}, --Empower Rune Weapon
+	[49203] = {60, nil, 60, 60, 60, 4}, --Hungering Cold
+	[48792] = {120, nil, 120, 120, 120, 0}, --Icebound Fortitude
+	[49039] = {120, nil, 120, 120, 120, 0}, --Lichborne
+	[47528] = {10, nil, 10, 10, 10, 0}, --Mind Freeze
+	[51271] = {60, nil, 60, 60, 60, 4}, --Unbreakable Armor
+	--Detection
+	[49143] = {0, nil, 0, 0, 0, 4}, --Frost Strike r1
+	[51416] = {0, nil, 0, 0, 0, 4}, --Frost Strike r2
+	[51271] = {0, nil, 0, 0, 0, 4}, --Frost Strike r3
+	[51418] = {0, nil, 0, 0, 0, 4}, --Frost Strike r4
+	[51419] = {0, nil, 0, 0, 0, 4}, --Frost Strike r5
+	[55268] = {0, nil, 0, 0, 0, 4}, --Frost Strike r6
+	[49184] = {0, nil, 0, 0, 0, 4}, --Howling Blast r1
+	[51409] = {0, nil, 0, 0, 0, 4}, --Howling Blast r2
+	[51410] = {0, nil, 0, 0, 0, 4}, --Howling Blast r3
+	[51411] = {0, nil, 0, 0, 0, 4}, --Howling Blast r4
 	--Unholy
-	[48707] = {45, nil}, --Anti-Magic Shell
-	[51052] = {120, nil}, --Anti-Magic Zone
-	[42650] = {360, nil}, --Army of the Dead
-	[49576] = {25, nil}, --Death Grip
-	[49206] = {180, nil}, --Summon Gargoyle
-	
+	[48707] = {45, nil, 45, 45, 45, 0}, --Anti-Magic Shell
+	[51052] = {120, nil, 120, 120, 120, 5}, --Anti-Magic Zone
+	[42650] = {360, nil, 600, 600, 360, 0}, --Army of the Dead
+	[49222] = {60, nil, 60, 60, 60, 5}, --Bone Shield
+	[49576] = {25, nil, 35, 35, 25, 0}, --Death Grip
+	[49206] = {180, nil, 180, 180, 180, 5}, --Summon Gargoyle
+	--Detection
+	[55090] = {0, nil, 0, 0, 0, 5}, --Scourge Strike r1
+	[55265] = {0, nil, 0, 0, 0, 5}, --Scourge Strike r2
+	[55270] = {0, nil, 0, 0, 0, 5}, --Scourge Strike r3
+	[55271] = {0, nil, 0, 0, 0, 5}, --Scourge Strike r4
+	[63560] = {0, nil, 0, 0, 0, 5}, --Ghoul Frenzy
 	--Shaman
 	--Total: 17
 	--Elemental
-	[2484] = {10.5, nil}, --Earthbind Totem
-	[16166] = {180, nil}, --Elemental Mastery
-	[2894] = {600, nil}, --Fire Elemental Totem
-	[51514] = {45, nil}, --Hex
-	[5730] = {21, nil}, --Stoneclaw Totem r1
-	[6390] = {21, nil}, --Stoneclaw Totem r2
-	[6391] = {21, nil}, --Stoneclaw Totem r3
-	[6392] = {21, nil}, --Stoneclaw Totem r4
-	[10427] = {21, nil}, --Stoneclaw Totem r5
-	[10428] = {21, nil}, --Stoneclaw Totem r6
-	[25525] = {21, nil}, --Stoneclaw Totem r7
-	[58580] = {21, nil}, --Stoneclaw Totem r8
-	[58581] = {21, nil}, --Stoneclaw Totem r9
-	[58582] = {21, nil}, --Stoneclaw Totem r10
-	[51490] = {45, nil}, --Thunderstorm r1
-	[59156] = {45, nil}, --Thunderstorm r1
-	[59158] = {45, nil}, --Thunderstorm r1
-	[59159] = {45, nil}, --Thunderstorm r1
-	[57994] = {5, nil}, --Wind Shear
+	[2484] = {10.5, nil, 10.5, 10.5, 10.5, 0}, --Earthbind Totem
+	[16166] = {180, nil, 180, 180, 180, 3}, --Elemental Mastery
+	[2894] = {600, nil, 600, 600, 600, 0}, --Fire Elemental Totem
+	[51514] = {45, nil, 45, 45, 45, 0}, --Hex
+	[5730] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r1
+	[6390] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r2
+	[6391] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r3
+	[6392] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r4
+	[10427] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r5
+	[10428] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r6
+	[25525] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r7
+	[58580] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r8
+	[58581] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r9
+	[58582] = {21, nil, 21, 21, 21, 0}, --Stoneclaw Totem r10
+	[51490] = {45, nil, 45, 45, 45, 3}, --Thunderstorm r1
+	[59156] = {45, nil, 45, 45, 45, 3}, --Thunderstorm r1
+	[59158] = {45, nil, 45, 45, 45, 3}, --Thunderstorm r1
+	[59159] = {45, nil, 45, 45, 45, 3}, --Thunderstorm r1
+	[57994] = {5, nil, 5, 5, 6, 0}, --Wind Shear
+	--Detection:
+	[30706] = {0, nil, 0, 0, 0, 3}, --Totem of Wrath r1
+	[57720] = {0, nil, 0, 0, 0, 3}, --Totem of Wrath r2
+	[57721] = {0, nil, 0, 0, 0, 3}, --Totem of Wrath r3
+	[57722] = {0, nil, 0, 0, 0, 3}, --Totem of Wrath r4
 	--Enhancement
-	[2825] = {300, nil}, --Bloodlust
-	[32182] = {300, nil}, --Heroism
-	[2062] = {600, nil}, --Earth Elemental Totem
-	[51533] = {180, nil}, --Feral Spirit
-	[58875] = {32, nil}, --Spirit Walk
-	[8177] = {13, nil}, --Grounding Totem
-	[30823] = {60, nil}, --Shamanistic Rage
+	[2825] = {300, nil, 300, 300, 300, 0}, --Bloodlust
+	[32182] = {300, nil, 300, 300, 300, 0}, --Heroism
+	[2062] = {600, nil, 600, 600, 600, 0}, --Earth Elemental Totem
+	[51533] = {180, nil, 180, 180, 180, 4}, --Feral Spirit
+	[58875] = {32, nil, 180, 180, 180, 4}, --Spirit Walk
+	[8177] = {13, nil, 15, 15, 15, 0}, --Grounding Totem
+	[30823] = {60, nil, 60, 60, 60, 4}, --Shamanistic Rage
+	--Detection
+	[17364] = {0, nil, 0, 0, 0, 4}, --Stormstrike
+	[60103] = {0, nil, 0, 0, 0, 4}, --Lava Lash
 	--Restoration
-	[16190] = {300, nil}, --Mana Tide Totem
-	[16188] = {120, nil}, --Nature's Swiftness
-	[55198] = {180, nil}, --Tidal Force
+	[16190] = {300, nil, 300, 300, 300, 0}, --Mana Tide Totem
+	[16188] = {120, nil, 300, 300, 300, 0}, --Nature's Swiftness
+	[55198] = {180, nil, 180, 180, 180, 0}, --Tidal Force
+	--Detection
+	[974] = {0, nil, 0, 0, 0, 5}, --Earth Shield r1
+	[32593] = {0, nil, 0, 0, 0, 5}, --Earth Shield r2
+	[32594] = {0, nil, 0, 0, 0, 5}, --Earth Shield r3
+	[49283] = {0, nil, 0, 0, 0, 5}, --Earth Shield r4
+	[49284] = {0, nil, 0, 0, 0, 5}, --Earth Shield r5
+	[61295] = {0, nil, 0, 0, 0, 5}, --Riptide r1
+	[61299] = {0, nil, 0, 0, 0, 5}, --Riptide r2
+	[61300] = {0, nil, 0, 0, 0, 5}, --Riptide r3
+	[61301] = {0, nil, 0, 0, 0, 5}, --Riptide r4
+	[51886] = {0, nil, 0, 0, 0, 5}, --Cleanse Spirit
+	--cleanse spirit
 	
 	---Mage
 	--Total: 18
-	--Freeze triggers combatlog event
+	--Freeze triggers no combatlog event
 	--Arcane
-	[12042] = {85, nil}, --Arcane Power
-	[1953] = {15, nil}, --Blink
-	[2139] = {24, nil}, --Counterspell
-	[12051] = {120, nil}, --Evocation
-	[66] = {130, nil}, --Invisibility
-	[55342] = {180, nil}, --Mirror Image
-	[12043] = {85, nil}, --Presence of Mind
+	[12042] = {85, nil, 85, 85, 85, 3}, --Arcane Power
+	[1953] = {15, nil, 15, 15, 15, 0}, --Blink
+	[2139] = {24, nil, 24, 24, 24, 0}, --Counterspell
+	[12051] = {120, nil, 120, 240, 240, 0}, --Evocation
+	[66] = {126, nil, 126, 180, 180, 0}, --Invisibility
+	[55342] = {180, nil, 180, 180, 180, 0}, --Mirror Image
+	[12043] = {85, nil, 85, 120, 120, 3}, --Presence of Mind
+	--for detection:
+	[44425] = {0, nil, 0, 0, 0, 3}, --Arcane Barrage r1
+	[44780] = {0, nil, 0, 0, 0, 3}, --Arcane Barrage r2
+	[44781] = {0, nil, 0, 0, 0, 3}, --Arcane Barrage r3
+	[31589] = {0, nil, 0, 0, 0, 3}, --Slow
 	--Fire
-	[11113] = {30, nil}, --Blast Wave r1
-	[13018] = {30, nil}, --Blast Wave r2
-	[13019] = {30, nil}, --Blast Wave r3
-	[13020] = {30, nil}, --Blast Wave r4
-	[13021] = {30, nil}, --Blast Wave r5
-	[27133] = {30, nil}, --Blast Wave r6
-	[33933] = {30, nil}, --Blast Wave r7
-	[42944] = {30, nil}, --Blast Wave r8
-	[42945] = {30, nil}, --Blast Wave r9
-	[28682] = {120, nil}, --Combustion
-	[31661] = {20, nil}, --Dragon's Breath r1
-	[33041] = {20, nil}, --Dragon's Breath r2
-	[33042] = {20, nil}, --Dragon's Breath r3
-	[33043] = {20, nil}, --Dragon's Breath r4
-	[42949] = {20, nil}, --Dragon's Breath r5
-	[42950] = {20, nil}, --Dragon's Breath r6
-	[543] = {30, nil}, --Fire Ward r1
-	[8457] = {30, nil}, --Fire Ward r2
-	[8458] = {30, nil}, --Fire Ward r3
-	[10223] = {30, nil}, --Fire Ward r4
-	[10225] = {30, nil}, --Fire Ward r5
-	[27128] = {30, nil}, --Fire Ward r6
-	[43010] = {30, nil}, --Fire Ward r7
+	[11113] = {30, nil, 30, 30, 30, 4}, --Blast Wave r1
+	[13018] = {30, nil, 30, 30, 30, 4}, --Blast Wave r2
+	[13019] = {30, nil, 30, 30, 30, 4}, --Blast Wave r3
+	[13020] = {30, nil, 30, 30, 30, 4}, --Blast Wave r4
+	[13021] = {30, nil, 30, 30, 30, 4}, --Blast Wave r5
+	[27133] = {30, nil, 30, 30, 30, 4}, --Blast Wave r6
+	[33933] = {30, nil, 30, 30, 30, 4}, --Blast Wave r7
+	[42944] = {30, nil, 30, 30, 30, 4}, --Blast Wave r8
+	[42945] = {30, nil, 30, 30, 30, 4}, --Blast Wave r9
+	[28682] = {120, nil, 120, 120, 120, 4}, --Combustion
+	[31661] = {20, nil, 30, 30, 30, 4}, --Dragon's Breath r1
+	[33041] = {20, nil, 30, 30, 30, 4}, --Dragon's Breath r2
+	[33042] = {20, nil, 30, 30, 30, 4}, --Dragon's Breath r3
+	[33043] = {20, nil, 30, 30, 30, 4}, --Dragon's Breath r4
+	[42949] = {20, nil, 30, 30, 30, 4}, --Dragon's Breath r5
+	[42950] = {20, nil, 30, 30, 30, 4}, --Dragon's Breath r6
+	[543] = {30, nil, 30, 30, 30, 0}, --Fire Ward r1
+	[8457] = {30, nil, 30, 30, 30, 0}, --Fire Ward r2
+	[8458] = {30, nil, 30, 30, 30, 0}, --Fire Ward r3
+	[10223] = {30, nil, 30, 30, 30, 0}, --Fire Ward r4
+	[10225] = {30, nil, 30, 30, 30, 0}, --Fire Ward r5
+	[27128] = {30, nil, 30, 30, 30, 0}, --Fire Ward r6
+	[43010] = {30, nil, 30, 30, 30, 0}, --Fire Ward r7
 	--Frost
 	[11958] = {384, 
 		{44572, 122, 865, 6131, 10230, 27088, 42917, 6143, 8461, 8462,
 		10177, 28609, 32796, 43012, 11426, 13031, 13032, 13033,
-		27134, 33405, 43038, 43039, 45438, 12472, 31687}}, --Cold Snap
-	[44572] = {30, nil}, --Deep Freeze
-	[122] = {20, nil}, --Frost Nova r1
-	[865] = {20, nil}, --Frost Nova r2
-	[6131] = {20, nil}, --Frost Nova r3
-	[10230] = {20, nil}, --Frost Nova r4
-	[27088] = {20, nil}, --Frost Nova r5
-	[42917] = {20, nil}, --Frost Nova r6
-	[6143] = {30, nil}, --Frost Ward r1
-	[8461] = {30, nil}, --Frost Ward r2
-	[8462] = {30, nil}, --Frost Ward r3
-	[10177] = {30, nil}, --Frost Ward r4
-	[28609] = {30, nil}, --Frost Ward r5
-	[32796] = {30, nil}, --Frost Ward r6
-	[43012] = {30, nil}, --Frost Ward r7
-	[11426] = {24, nil}, --Ice Barrier r1
-	[13031] = {24, nil}, --Ice Barrier r2
-	[13032] = {24, nil}, --Ice Barrier r3
-	[13033] = {24, nil}, --Ice Barrier r4
-	[27134] = {24, nil}, --Ice Barrier r5
-	[33405] = {24, nil}, --Ice Barrier r6
-	[43038] = {24, nil}, --Ice Barrier r7
-	[43039] = {24, nil}, --Ice Barrier r8
-	[45438] = {240, nil}, --Ice Block
-	[12472] = {144, nil}, --Icy Veins
-	[31687] = {144, nil}, --Summon Water Elemental
+		27134, 33405, 43038, 43039, 45438, 12472, 31687}, 480, 480, 384, 5}, --Cold Snap
+	[44572] = {30, nil, 30, 30, 30, 5}, --Deep Freeze
+	[122] = {20, nil, 20, 20, 20, 0}, --Frost Nova r1
+	[865] = {20, nil, 20, 20, 20, 0}, --Frost Nova r2
+	[6131] = {20, nil, 20, 20, 20, 0}, --Frost Nova r3
+	[10230] = {20, nil, 20, 20, 20, 0}, --Frost Nova r4
+	[27088] = {20, nil, 20, 20, 20, 0}, --Frost Nova r5
+	[42917] = {20, nil, 20, 20, 20, 0}, --Frost Nova r6
+	[6143] = {30, nil, 30, 30, 30, 0}, --Frost Ward r1
+	[8461] = {30, nil, 30, 30, 30, 0}, --Frost Ward r2
+	[8462] = {30, nil, 30, 30, 30, 0}, --Frost Ward r3
+	[10177] = {30, nil, 30, 30, 30, 0}, --Frost Ward r4
+	[28609] = {30, nil, 30, 30, 30, 0}, --Frost Ward r5
+	[32796] = {30, nil, 30, 30, 30, 0}, --Frost Ward r6
+	[43012] = {30, nil, 30, 30, 30, 0}, --Frost Ward r7
+	[11426] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r1
+	[13031] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r2
+	[13032] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r3
+	[13033] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r4
+	[27134] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r5
+	[33405] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r6
+	[43038] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r7
+	[43039] = {24, nil, 24, 24, 24, 5}, --Ice Barrier r8
+	[45438] = {240, nil, 240, 240, 240, 0}, --Ice Block
+	[12472] = {144, nil, 144, 144, 144, 0}, --Icy Veins
+	[31687] = {144, nil, 144, 144, 144, 5}, --Summon Water Elemental
 	
 	--Warlock
 	--Total 10 (12 with pets)
 	--Affliction
-	[6789] = {120, nil}, --Death Coil r1
-	[17925] = {120, nil}, --Death Coil r2
-	[17962] = {120, nil}, --Death Coil r3
-	[27223] = {120, nil}, --Death Coil r4
-	[47859] = {120, nil}, --Death Coil r5
-	[47860] = {120, nil}, --Death Coil r6
-	[5484] = {40, nil}, --Howl of Terror r1
-	[17928] = {40, nil}, --Howl of Terror r2
+	[6789] = {120, nil, 120, 120, 120, 0}, --Death Coil r1
+	[17925] = {120, nil, 120, 120, 120, 0}, --Death Coil r2
+	[17962] = {120, nil, 120, 120, 120, 0}, --Death Coil r3
+	[27223] = {120, nil, 120, 120, 120, 0}, --Death Coil r4
+	[47859] = {120, nil, 120, 120, 120, 0}, --Death Coil r5
+	[47860] = {120, nil, 120, 120, 120, 0}, --Death Coil r6
+	[5484] = {40, nil, 40, 40, 40, 0}, --Howl of Terror r1
+	[17928] = {40, nil, 40, 40, 40, 0}, --Howl of Terror r2
+	--Detection
+	[30108] = {0, nil, 0, 0, 0, 3}, --Unstable Affliction r1
+	[30404] = {0, nil, 0, 0, 0, 3}, --Unstable Affliction r2
+	[30405] = {0, nil, 0, 0, 0, 3}, --Unstable Affliction r3
+	[47841] = {0, nil, 0, 0, 0, 3}, --Unstable Affliction r4
+	[47843] = {0, nil, 0, 0, 0, 3}, --Unstable Affliction r5
+	[48181] = {0, nil, 0, 0, 0, 3}, --Haunt r1
+	[59161] = {0, nil, 0, 0, 0, 3}, --Haunt r2
+	[59163] = {0, nil, 0, 0, 0, 3}, --Haunt r3
+	[59164] = {0, nil, 0, 0, 0, 3}, --Haunt r4
+	[18223] = {0, nil, 0, 0, 0, 3}, --Curse of Exhaustion
 	--Demonology
-	[54785] = {45, nil}, --Demon Charge
-	[48020] = {30, nil}, --Demonic Circle: Teleport
-	[47193] = {42, nil}, --Demonic Empowerment
-	[18708] = {126, nil}, --Fel Domination
-	[50589] = {30, nil}, --Immolation Aura
-	[47241] = {130, nil}, --Metamorphosis
-	[6229] = {30, nil}, --Shadow Ward r1
-	[11739] = {30, nil}, --Shadow Ward r2
-	[11740] = {30, nil}, --Shadow Ward r3
-	[28610] = {30, nil}, --Shadow Ward r4
-	[47890] = {30, nil}, --Shadow Ward r5
-	[47891] = {30, nil}, --Shadow Ward r6
+	[54785] = {45, nil, 45, 45, 45, 4}, --Demon Charge
+	[48020] = {30, nil, 30, 30, 30, 0}, --Demonic Circle: Teleport
+	[47193] = {42, nil, 42, 42, 42, 4}, --Demonic Empowerment
+	[18708] = {126, nil, 180, 126, 180, 0}, --Fel Domination
+	[50589] = {30, nil, 30, 30, 30, 4}, --Immolation Aura
+	[47241] = {130, nil, 130, 130, 130, 4}, --Metamorphosis
+	[6229] = {30, nil, 30, 30, 30, 0}, --Shadow Ward r1
+	[11739] = {30, nil, 30, 30, 30, 0}, --Shadow Ward r2
+	[11740] = {30, nil, 30, 30, 30, 0}, --Shadow Ward r3
+	[28610] = {30, nil, 30, 30, 30, 0}, --Shadow Ward r4
+	[47890] = {30, nil, 30, 30, 30, 0}, --Shadow Ward r5
+	[47891] = {30, nil, 30, 30, 30, 0}, --Shadow Ward r6
+	--Detection
+	[47193] = {0, nil, 0, 0, 0, 0}, --Demonic Empowerment
 	--Destruction
-	[30283] = {20, nil}, --Shadowfury r1
-	[30413] = {20, nil}, --Shadowfury r2
-	[30414] = {20, nil}, --Shadowfury r3
-	[47846] = {20, nil}, --Shadowfury r4
-	[47847] = {20, nil}, --Shadowfury r5
+	[30283] = {20, nil, 20, 20, 20, 5}, --Shadowfury r1
+	[30413] = {20, nil, 20, 20, 20, 5}, --Shadowfury r2
+	[30414] = {20, nil, 20, 20, 20, 5}, --Shadowfury r3
+	[47846] = {20, nil, 20, 20, 20, 5}, --Shadowfury r4
+	[47847] = {20, nil, 20, 20, 20, 5}, --Shadowfury r5
+	--Detection
+	[17962] = {0, nil, 0, 0, 0, 5}, --Conflagrate
 	--Pets
-	[19647] = {24, nil}, --Spell Lock
-	[47986] = {60, nil}, --Sacrifice
+	[19647] = {24, nil, 0, 0, 0, 0}, --Spell Lock
+	[47986] = {60, nil, 0, 0, 0, 0}, --Sacrifice
 	
 	--Druid
 	--Total: 18
 	--Typhoon only triggers combat log event, when it hits something
 	--Balance
-	[22812] = {60, nil}, --Barkskin
-	[33831] = {180, nil}, --Force of Nature
-	[29166] = {180, nil}, --Innervate
-	[16689] = {60, nil}, --Nature's Grasp r1
-	[16810] = {60, nil}, --Nature's Grasp r2
-	[16811] = {60, nil}, --Nature's Grasp r3
-	[16812] = {60, nil}, --Nature's Grasp r4
-	[16813] = {60, nil}, --Nature's Grasp r5
-	[17329] = {60, nil}, --Nature's Grasp r6
-	[27009] = {60, nil}, --Nature's Grasp r7
-	[53312] = {60, nil}, --Nature's Grasp r8
-	[48505] = {90, nil}, --Starfall r1
-	[53199] = {90, nil}, --Starfall r2
-	[53200] = {90, nil}, --Starfall r3
-	[53201] = {90, nil}, --Starfall r4
-	[61391] = {20, nil}, --Typhoon r1
-	[61390] = {20, nil}, --Typhoon r2
-	[61388] = {20, nil}, --Typhoon r3
-	[61387] = {20, nil}, --Typhoon r4
-	[53227] = {20, nil}, --Typhoon r5
+	[22812] = {60, nil, 60, 60, 60, 0}, --Barkskin
+	[33831] = {180, nil, 180, 180, 180, 3}, --Force of Nature
+	[29166] = {180, nil, 180, 180, 180, 0}, --Innervate
+	[16689] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r1
+	[16810] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r2
+	[16811] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r3
+	[16812] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r4
+	[16813] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r5
+	[17329] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r6
+	[27009] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r7
+	[53312] = {60, nil, 60, 60, 60, 0}, --Nature's Grasp r8
+	[48505] = {90, nil, 90, 90, 90, 3}, --Starfall r1
+	[53199] = {90, nil, 90, 90, 90, 3}, --Starfall r2
+	[53200] = {90, nil, 90, 90, 90, 3}, --Starfall r3
+	[53201] = {90, nil, 90, 90, 90, 3}, --Starfall r4
+	[61391] = {20, nil, 20, 20, 20, 3}, --Typhoon r1
+	[61390] = {20, nil, 20, 20, 20, 3}, --Typhoon r2
+	[61388] = {20, nil, 20, 20, 20, 3}, --Typhoon r3
+	[61387] = {20, nil, 20, 20, 20, 3}, --Typhoon r4
+	[53227] = {20, nil, 20, 20, 20, 3}, --Typhoon r5
 	--Feral
-	[5211] = {30, nil}, --Bash r1
-	[6798] = {30, nil}, --Bash r2
-	[8983] = {30, nil}, --Bash r3
-	[50334] = {180, nil}, --Berserk
-	[1850] = {144, nil}, --Dash r1
-	[9821] = {144, nil}, --Dash r2
-	[33357] = {144, nil}, --Dash r3
-	[5229] = {60, nil}, --Enrage
-	[16979] = {15, nil}, --Feral Charge - Bear
-	[49376] = {30, nil}, --Feral Charge - Cat
-	[22842] = {180, nil}, --Frenzied Regeneration
-	[22570] = {10, nil}, --Maim r1
-	[49802] = {10, nil}, --Maim r2
-	[61336] = {180, nil}, --Survival Instinct
-	[5217] = {30, nil}, --Tiger's Fury r1
-	[6793] = {30, nil}, --Tiger's Fury r2
-	[9845] = {30, nil}, --Tiger's Fury r3
-	[9856] = {30, nil}, --Tiger's Fury r4
-	[50212] = {30, nil}, --Tiger's Fury r5
-	[50213] = {30, nil}, --Tiger's Fury r6
+	[5211] = {30, nil, 60, 30, 60, 0}, --Bash r1
+	[6798] = {30, nil, 60, 30, 60, 0}, --Bash r2
+	[8983] = {30, nil, 60, 30, 60, 0}, --Bash r3
+	[50334] = {180, nil, 180, 180, 180, 4}, --Berserk
+	[1850] = {144, nil, 144, 144, 144, 0}, --Dash r1
+	[9821] = {144, nil, 144, 144, 144, 0}, --Dash r2
+	[33357] = {144, nil, 144, 144, 144, 0}, --Dash r3
+	[5229] = {60, nil, 60, 60, 60, 0}, --Enrage
+	[16979] = {15, nil, 15, 15, 15, 0}, --Feral Charge - Bear
+	[49376] = {30, nil, 30, 30, 30, 0}, --Feral Charge - Cat
+	[22842] = {180, nil, 180, 180, 180, 0}, --Frenzied Regeneration
+	[22570] = {10, nil, 10, 10, 10, 0}, --Maim r1
+	[49802] = {10, nil, 10, 10, 10, 0}, --Maim r2
+	[61336] = {180, nil, 180, 180, 180, 0}, --Survival Instinct
+	[5217] = {30, nil, 30, 30, 30, 0}, --Tiger's Fury r1
+	[6793] = {30, nil, 30, 30, 30, 0}, --Tiger's Fury r2
+	[9845] = {30, nil, 30, 30, 30, 0}, --Tiger's Fury r3
+	[9856] = {30, nil, 30, 30, 30, 0}, --Tiger's Fury r4
+	[50212] = {30, nil, 30, 30, 30, 0}, --Tiger's Fury r5
+	[50213] = {30, nil, 30, 30, 30, 0}, --Tiger's Fury r6
+	--Detection
+	[33876] = {0, nil, 0, 0, 0, 4}, --Mangle (Cat) r1
+	[33982] = {0, nil, 0, 0, 0, 4}, --Mangle (Cat) r2
+	[33983] = {0, nil, 0, 0, 0, 4}, --Mangle (Cat) r3
+	[48565] = {0, nil, 0, 0, 0, 4}, --Mangle (Cat) r4
+	[48566] = {0, nil, 0, 0, 0, 4}, --Mangle (Cat) r5
+	[33878] = {0, nil, 0, 0, 0, 4}, --Mangle (Bear) r1
+	[33986] = {0, nil, 0, 0, 0, 4}, --Mangle (Bear) r2
+	[33987] = {0, nil, 0, 0, 0, 4}, --Mangle (Bear) r3
+	[48563] = {0, nil, 0, 0, 0, 4}, --Mangle (Bear) r4
+	[48564] = {0, nil, 0, 0, 0, 4}, --Mangle (Bear) r5
 	--Restoration
-	[17116] = {180, nil}, --Nature's Swiftness
-	[18562] = {15, nil}, --Swiftmend
-	[740] = {192, nil}, --Tranquility r1
-	[8918] = {192, nil}, --Tranquility r2
-	[9862] = {192, nil}, --Tranquility r3
-	[9863] = {192, nil}, --Tranquility r4
-	[26983] = {192, nil}, --Tranquility r5
-	[48446] = {192, nil}, --Tranquility r6
-	[48447] = {192, nil} --Tranquility r7
+	[17116] = {180, nil, 180, 180, 180, 5}, --Nature's Swiftness
+	[18562] = {15, nil, 15, 15, 15, 5}, --Swiftmend
+	[740] = {192, nil, 480, 480, 192, 0}, --Tranquility r1
+	[8918] = {192, nil, 480, 480, 192, 0}, --Tranquility r2
+	[9862] = {192, nil, 480, 480, 192, 0}, --Tranquility r3
+	[9863] = {192, nil, 480, 480, 192, 0}, --Tranquility r4
+	[26983] = {192, nil, 480, 480, 192, 0}, --Tranquility r5
+	[48446] = {192, nil, 480, 480, 192, 0}, --Tranquility r6
+	[48447] = {192, nil, 480, 480, 192, 0}, --Tranquility r7
+	--Detection
+	[48438] = {0, nil, 0, 0, 0, 5}, --Wild Growth r1
+	[53248] = {0, nil, 0, 0, 0, 5}, --Wild Growth r2
+	[53249] = {0, nil, 0, 0, 0, 5}, --Wild Growth r3
+	[53251] = {0, nil, 0, 0, 0, 5}, --Wild Growth r4
+	[33891] = {0, nil, 0, 0, 0, 5}, --Tree of Life
 }
\ No newline at end of file
diff --git a/embeds.xml b/embeds.xml
index 80c290f..0a82d95 100644
--- a/embeds.xml
+++ b/embeds.xml
@@ -7,12 +7,12 @@
   <Include file="lib\CallbackHandler-1.0\CallbackHandler-1.0.xml" />
   <Include file="lib\AceAddon-3.0\AceAddon-3.0.xml" />
   <Include file="lib\AceBucket-3.0\AceBucket-3.0.xml" />
+  <Include file="lib\AceGUI-3.0\AceGUI-3.0.xml" />
   <Include file="lib\AceConfig-3.0\AceConfig-3.0.xml" />
   <Include file="lib\AceConsole-3.0\AceConsole-3.0.xml" />
   <Include file="lib\AceDB-3.0\AceDB-3.0.xml" />
   <Include file="lib\AceDBOptions-3.0\AceDBOptions-3.0.xml" />
   <Include file="lib\AceEvent-3.0\AceEvent-3.0.xml" />
-  <Include file="lib\AceGUI-3.0\AceGUI-3.0.xml" />
   <Include file="lib\AceHook-3.0\AceHook-3.0.xml" />
   <Include file="lib\AceLocale-3.0\AceLocale-3.0.xml" />
   <Include file="lib\AceSerializer-3.0\AceSerializer-3.0.xml" />