diff --git a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua
new file mode 100644
index 0000000..02b6d89
--- /dev/null
+++ b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/AttackPower.lua
@@ -0,0 +1,67 @@
+local E, L, V, P, G = unpack(ElvUI);
+local DT = E:GetModule("DataTexts");
+
+local max = math.max;
+local format, join, sub = string.format, string.join, string.sub
+
+local ComputePetBonus = ComputePetBonus;
+local UnitAttackPower = UnitAttackPower;
+local UnitRangedAttackPower = UnitRangedAttackPower;
+local ATTACK_POWER_COLON = ATTACK_POWER_COLON;
+local ATTACK_POWER_MAGIC_NUMBER = ATTACK_POWER_MAGIC_NUMBER;
+local MELEE_ATTACK_POWER = MELEE_ATTACK_POWER;
+local MELEE_ATTACK_POWER_TOOLTIP = MELEE_ATTACK_POWER_TOOLTIP;
+local PET_BONUS_TOOLTIP_RANGED_ATTACK_POWER = PET_BONUS_TOOLTIP_RANGED_ATTACK_POWER;
+local PET_BONUS_TOOLTIP_SPELLDAMAGE = PET_BONUS_TOOLTIP_SPELLDAMAGE;
+local RANGED_ATTACK_POWER = RANGED_ATTACK_POWER;
+local RANGED_ATTACK_POWER_TOOLTIP = RANGED_ATTACK_POWER_TOOLTIP;
+local ATTACK_POWER_TOOLTIP = ATTACK_POWER_TOOLTIP
+
+local ATTACK_POWER = sub(ATTACK_POWER_COLON, 1, -2)
+
+local base, posBuff, negBuff, effective, Rbase, RposBuff, RnegBuff, Reffective, pwr;
+local displayNumberString = "";
+local lastPanel;
+
+local function OnEvent(self)
+	if(E.myclass == "HUNTER") then
+		Rbase, RposBuff, RnegBuff = UnitRangedAttackPower("player");
+		Reffective = Rbase + RposBuff + RnegBuff;
+		pwr = Reffective;
+	else
+		base, posBuff, negBuff = UnitAttackPower("player");
+		effective = base + posBuff + negBuff;
+		pwr = effective;
+	end
+
+	self.text:SetText(format(displayNumberString, ATTACK_POWER, pwr));
+	lastPanel = self;
+end
+
+local function OnEnter(self)
+	DT:SetupTooltip(self);
+
+	if(E.myclass == "HUNTER") then
+		DT.tooltip:AddDoubleLine(RANGED_ATTACK_POWER, pwr, 1, 1, 1);
+
+		local line = format(RANGED_ATTACK_POWER_TOOLTIP, max((pwr), 0) / ATTACK_POWER_MAGIC_NUMBER);
+
+		DT.tooltip:AddLine(line, nil, nil, nil, true);
+	else
+		DT.tooltip:AddDoubleLine(MELEE_ATTACK_POWER, pwr, 1, 1, 1);
+		DT.tooltip:AddLine(format(MELEE_ATTACK_POWER_TOOLTIP, max((base + posBuff + negBuff), 0) / ATTACK_POWER_MAGIC_NUMBER), nil, nil, nil, true);
+	end
+
+	DT.tooltip:Show();
+end
+
+local function ValueColorUpdate(hex)
+	displayNumberString = join("", "%s: ", hex, "%d|r");
+
+	if(lastPanel ~= nil) then
+		OnEvent(lastPanel);
+	end
+end
+E["valueColorUpdateFuncs"][ValueColorUpdate] = true;
+
+DT:RegisterDatatext("Attack Power", {"UNIT_ATTACK_POWER", "UNIT_RANGED_ATTACK_POWER"}, OnEvent, nil, nil, OnEnter, nil, ATTACK_POWER_TOOLTIP)
\ No newline at end of file
diff --git a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/Load_DataTexts.xml b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/Load_DataTexts.xml
index f83487e..cacfb11 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/DataTexts/Load_DataTexts.xml
+++ b/2/3/4/5/6/7/ElvUI/Modules/DataTexts/Load_DataTexts.xml
@@ -1,6 +1,7 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
 	<Script file="DataTexts.lua"/>
 	<Script file="Armor.lua"/>
+	<Script file="AttackPower.lua"/>
 	<Script file="Avoidance.lua"/>
 	<Script file="Durability.lua"/>
 	<Script file="Friends.lua"/>