diff --git a/libs/StatLogic/Cata_Logic.lua b/libs/StatLogic/Cata_Logic.lua
index 9ab8c0a..70962cc 100644
--- a/libs/StatLogic/Cata_Logic.lua
+++ b/libs/StatLogic/Cata_Logic.lua
@@ -282,26 +282,41 @@ addon.DodgePerAgi = {
 	["WARRIOR"] = addon.zero,
 	["PALADIN"] = addon.zero,
 	["HUNTER"] = {
-		[85] = 0.0133266,
+		0.45430000, -- [1]
+		[80] = 0.01333760,
+		[85] = 0.00230177,
 	},
 	["ROGUE"] = {
-		[85] = 0.0240537,
+		0.91880004, -- [1]
+		[80] = 0.02474332,
+		[85] = 0.00430335,
 	},
 	["PRIEST"] = {
-		[85] = 0.0192366,
+		0.09080001, -- [1]
+		[80] = 0.01920001,
+		[85] = 0.00330000,
 	},
 	["DEATHKNIGHT"] = addon.zero,
 	["SHAMAN"] = {
-		[85] = 0.0192366,
+		0.16620000, -- [1]
+		[80] = 0.01920000,
+		[85] = 0.00330000,
 	},
 	["MAGE"] = {
-		[85] = 0.0195253,
+		0.07712273, -- [1]
+		[80] = 0.01951111,
+		[85] = 0.00331163,
 	},
 	["WARLOCK"] = {
-		[85] = 0.0192366,
+		0.14830000, -- [1]
+		[80] = 0.01920000,
+		[85] = 0.00330000,
 	},
 	["DRUID"] = {
-		[85] = 0.0240458,
+		0.25239997, -- [1]
+		[80] = 0.02400000,
+		[85] = 0.00410000,
+
 	},
 }
 
diff --git a/libs/StatLogic/StatLogic.lua b/libs/StatLogic/StatLogic.lua
index 6ace162..1bd0d5f 100644
--- a/libs/StatLogic/StatLogic.lua
+++ b/libs/StatLogic/StatLogic.lua
@@ -2085,15 +2085,15 @@ if GetCurrentRegion() == 1 or GetCurrentRegion() == 72 and GetLocale() == "enUS"
 					if tocversion >= 40000 then
 						rounding = 10 ^ 8
 					end
-					if not rawget(addon.CritPerAgi[addon.class], level) then
+					if not rawget(addon.CritPerAgi[addon.class], level) and addon.CritPerAgi[addon.class] ~= addon.zero then
 						local critPerAgi = floor(StatLogic:GetCritPerAgi() * rounding + 0.5) / rounding
 						expansion.CritPerAgi[addon.class][level] = critPerAgi
 					end
-					if not rawget(addon.DodgePerAgi[addon.class], level) then
+					if not rawget(addon.DodgePerAgi[addon.class], level) and addon.DodgePerAgi[addon.class] ~= addon.zero then
 						local dodgePerAgi = floor(StatLogic:GetDodgePerAgi() * rounding + 0.5) / rounding
 						expansion.DodgePerAgi[addon.class][level] = dodgePerAgi
 					end
-					if not rawget(addon.SpellCritPerInt[addon.class], level) then
+					if not rawget(addon.SpellCritPerInt[addon.class], level) and addon.SpellCritPerInt[addon.class] ~= addon.zero then
 						local spellCritPerInt = floor(StatLogic:GetSpellCritPerInt() * rounding + 0.5) / rounding
 						expansion.SpellCritPerInt[addon.class][level] = spellCritPerInt
 					end
diff --git a/libs/StatLogic/Wrath_Logic.lua b/libs/StatLogic/Wrath_Logic.lua
index 2ebe402..92132c1 100644
--- a/libs/StatLogic/Wrath_Logic.lua
+++ b/libs/StatLogic/Wrath_Logic.lua
@@ -438,6 +438,19 @@ local DodgePerCrit = {
 
 addon.DodgePerAgi = setmetatable({
 	["HUNTER"] = {
+		0.3951, 0.3786, 0.3635, 0.3366, 0.3245, 0.3133, 0.3029, 0.2931, 0.2754, 0.2673,
+		0.2456, 0.2164, 0.1975, 0.1817, 0.1652, 0.1567, 0.1466, 0.1356, 0.1280, 0.1196,
+		0.1150, 0.1082, 0.1033, 0.0977, 0.0937, 0.0900, 0.0857, 0.0826, 0.0790, 0.0757,
+		0.0739, 0.0710, 0.0683, 0.0663, 0.0640, 0.0622, 0.0602, 0.0582, 0.0564, 0.0551,
+		0.0538, 0.0522, 0.0508, 0.0494, 0.0481, 0.0471, 0.0459, 0.0445, 0.0435, nil,
+		[67] = 0.0258,
+		[68] = 0.0253,
+		[69] = 0.0247,
+		[70] = 0.0241,
+		[75] = 0.0167,
+		[76] = 0.0155,
+		[77] = 0.0144,
+		[78] = 0.0134,
 		[80] = 0.0116,
 	},
 	["WARLOCK"] = {