diff --git a/NewAge/NullBarrier/CLEU.lua b/NewAge/NullBarrier/CLEU.lua
index 4c6d995..1f3cf06 100644
--- a/NewAge/NullBarrier/CLEU.lua
+++ b/NewAge/NullBarrier/CLEU.lua
@@ -3,7 +3,7 @@ function()
         local target = select(5, CombatLogGetCurrentEventInfo())
         local buff = select(13, CombatLogGetCurrentEventInfo())
         if target == UnitName("player") and aura_env.buffs[buff] ~= nil then
-            aura_env.max = select(16, CombatLogGetCurrentEventInfo())
+            aura_env.max = aura_env.GetAbsorbs()
         end
     end
     return true
diff --git a/NewAge/NullBarrier/CustomDuration b/NewAge/NullBarrier/CustomDuration
deleted file mode 100644
index e69de29..0000000
diff --git a/NewAge/NullBarrier/CustomDuration.lua b/NewAge/NullBarrier/CustomDuration.lua
new file mode 100644
index 0000000..8732875
--- /dev/null
+++ b/NewAge/NullBarrier/CustomDuration.lua
@@ -0,0 +1,3 @@
+function()
+    return aura_env.GetAbsorbs(), aura_env.max, 1
+end
\ No newline at end of file
diff --git a/NewAge/NullBarrier/INIT.lua b/NewAge/NullBarrier/INIT.lua
index c3aeabc..0390795 100644
--- a/NewAge/NullBarrier/INIT.lua
+++ b/NewAge/NullBarrier/INIT.lua
@@ -1,4 +1,7 @@
-aura_env.buffs = {"Null Barrier", "Empowered Null Barrier"}
+aura_env.buffs = {
+    ["Null Barrier"] = 1,
+    ["Empowered Null Barrier"] = 1,
+}
 aura_env.max = 0
 
 aura_env.GetBuff = function(name)
@@ -17,8 +20,8 @@ end
 
 aura_env.GetAbsorbs = function()
     local abs = 0
-    for k, v in ipairs(aura_env.buffs) do
-        abs = abs + aura_env.GetAbsorb(v)
+    for k, v in pairs(aura_env.buffs) do
+        abs = abs + aura_env.GetAbsorb(k)
     end
     return abs
 end