diff --git a/ConRO.toc b/ConRO.toc
index dc07d53..c4308bb 100644
--- a/ConRO.toc
+++ b/ConRO.toc
@@ -1,6 +1,6 @@
 ## Title:-|cffFFFFFFConRO|r- Conflict Rotation Optimizer
 ## Notes: Rotation helper framework.
-## Version: 10.0.19
+## Version: 10.0.20
 ## Author: Vae
 ## Interface: 100002
 ## SavedVariables: ConROPreferences
diff --git a/helper.lua b/helper.lua
index 71c764c..d259ac2 100644
--- a/helper.lua
+++ b/helper.lua
@@ -342,7 +342,31 @@ function ConRO:Targets(spellID)
 
 			for i = 1, 15 do
 				if not UnitIsFriend("player", 'nameplate' .. i) then
-					if UnitExists('nameplate' .. i) and IsItemInRange(37727, "nameplate"..i) == true then
+					if UnitExists('nameplate' .. i) and IsItemInRange(32321, "nameplate"..i) == true then
+						number_in_range = number_in_range + 1
+					end
+				end
+			end
+		elseif spellID == "25" then
+			if IsItemInRange(24268, "target") then
+				target_in_range = true;
+			end
+
+			for i = 1, 15 do
+				if not UnitIsFriend("player", 'nameplate' .. i) then
+					if UnitExists('nameplate' .. i) and IsItemInRange(24268, "nameplate"..i) == true then
+						number_in_range = number_in_range + 1
+					end
+				end
+			end
+		elseif spellID == "40" then
+			if IsItemInRange(28767, "target") then
+				target_in_range = true;
+			end
+
+			for i = 1, 15 do
+				if not UnitIsFriend("player", 'nameplate' .. i) then
+					if UnitExists('nameplate' .. i) and IsItemInRange(28767, "nameplate"..i) == true then
 						number_in_range = number_in_range + 1
 					end
 				end