diff --git a/Constants.lua b/Constants.lua
index 67c8f8d..cbffad3 100644
--- a/Constants.lua
+++ b/Constants.lua
@@ -890,12 +890,12 @@ local cooldownList = {
 
     -- Warrior
     ["WARRIOR"] = {
-        --[[6552] 	= { cd = 10,                              -- Pummel
+        [6552] 	= { cd = 10,                              -- Pummel
            sharedCD = {
               [72] = true,
            },
         },
-        [72] 	   = { cd = 12,                              -- Shield Bash
+        --[[72] 	   = { cd = 12,                              -- Shield Bash
            sharedCD = {
               [6552] = true,
            },
diff --git a/Gladdy.lua b/Gladdy.lua
index a3f6578..35a68b1 100644
--- a/Gladdy.lua
+++ b/Gladdy.lua
@@ -26,7 +26,7 @@ local MAJOR, MINOR = "Gladdy", 4
 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR)
 local L
 Gladdy.version_major_num = 1
-Gladdy.version_minor_num = 0.20
+Gladdy.version_minor_num = 0.21
 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num
 Gladdy.version_releaseType = RELEASE_TYPES.release
 Gladdy.version = PREFIX .. Gladdy.version_num .. "-" .. Gladdy.version_releaseType
@@ -463,17 +463,39 @@ end
 
 function Gladdy:BlizzArenaSetAlpha(alpha)
     if IsAddOnLoaded("Blizzard_ArenaUI") then
-        ArenaEnemyFrames:SetAlpha(alpha)
-        ArenaEnemyFrame1:SetAlpha(alpha)
-        ArenaEnemyFrame1PetFrame:SetAlpha(alpha)
-        ArenaEnemyFrame2:SetAlpha(alpha)
-        ArenaEnemyFrame2PetFrame:SetAlpha(alpha)
-        ArenaEnemyFrame3:SetAlpha(alpha)
-        ArenaEnemyFrame3PetFrame:SetAlpha(alpha)
-        ArenaEnemyFrame4:SetAlpha(alpha)
-        ArenaEnemyFrame4PetFrame:SetAlpha(alpha)
-        ArenaEnemyFrame5:SetAlpha(alpha)
-        ArenaEnemyFrame5PetFrame:SetAlpha(alpha)
+        if (ArenaEnemyFrames) then
+            ArenaEnemyFrames:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame1 then
+            ArenaEnemyFrame1:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame1PetFrame then
+            ArenaEnemyFrame1PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame2 then
+            ArenaEnemyFrame2:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame2PetFrame then
+            ArenaEnemyFrame2PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame3 then
+            ArenaEnemyFrame3:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame3PetFrame then
+            ArenaEnemyFrame3PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame4 then
+            ArenaEnemyFrame4:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame4PetFrame then
+            ArenaEnemyFrame4PetFrame:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame5 then
+            ArenaEnemyFrame5:SetAlpha(alpha)
+        end
+        if ArenaEnemyFrame5PetFrame then
+            ArenaEnemyFrame5PetFrame:SetAlpha(alpha)
+        end
     end
 end
 
diff --git a/Gladdy.toc b/Gladdy.toc
index b3623bc..e011806 100644
--- a/Gladdy.toc
+++ b/Gladdy.toc
@@ -1,6 +1,6 @@
 ## Interface: 20502
 ## Title: Gladdy - TBC
-## Version: 1.20-Release
+## Version: 1.21-Release
 ## Notes: The most powerful arena AddOn for WoW 2.5.1
 ## Author: XiconQoo, DnB_Junkee, Knall
 ## X-Email: contact me on discord Knall#1751
diff --git a/README.md b/README.md
index 06f3d23..eaa9f30 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Gladdy - TBC
 
 ### The most powerful arena addon for WoW TBC 2.5.1
-## [v1.20-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.20-Release/Gladdy_TBC-Classic_v1.20-Release.zip)
+## [v1.21-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v1.21-Release/Gladdy_TBC-Classic_v1.21-Release.zip)
 
 ###### <a target="_blank" rel="noopener noreferrer" href="https://www.paypal.me/xiconqoo/10"><img src="https://raw.githubusercontent.com/XiconQoo/Gladdy/readme-media/Paypal-Donate.png" height="30" style="margin-top:-30px;position:relative;top:20px;"></a> Please consider donating if you like my work
 
@@ -62,6 +62,10 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca
 
 ### Changes
 
+### v1.21-Release
+- fixed error when hiding blizzard frames ArenaEnemyFrames related to ElvUI
+- added Pummel cooldown
+
 ### v1.20-Release
 - configurable DR duration
 - scale in 0.01 percent steps