@@ -178,73 +178,57 @@
 	elseif args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 
 function mod:SPELL_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 
 function mod:SWING_DAMAGE(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 
 function mod:SWING_MISSED(args)
 	if args:GetDestCreatureID() == 39863 then
 		if not physicalAggro and GetTime() - phase2Started > 15 then --We don't have phase 3 aggro on him yet.
 			physicalAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("PhysicalAggro")--We do now.
 			end
-		end
 	elseif args:GetDestCreatureID() == 40141 then
 		if not twilightAggro then --We don't have aggro on him yet.
 			twilightAggro = true
-			if mod:LatencyCheck() then
 				self:SendSync("twilightAggro")--We do now.
 			end
 		end
 	end
-end
 --End Phase aggro detection
 
 function mod:UNIT_HEALTH(uId)
@@ -346,8 +330,10 @@
 			end
 		end
 	elseif msg == "PhysicalAggro" then
+		physicalAggro = true
 		timerFieryConsumptionCD:Start(15)--Timer doesn't start again until aggroed again in phase 3. Timer value itself may need adjusting now that it's starting in right place
 	elseif msg == "twilightAggro" then
+		twilightAggro = true
 		timerShadowConsumptionCD:Start(15)--Timer doesn't start until actual twilight form is aggroed. Timer value itself may need adjusting now that it's starting in right place
 	end
 end