diff --git a/BasicRotations/Ranged/MCH_Beta.cs b/BasicRotations/Ranged/MCH_Beta.cs
index dca0444..411b10d 100644
--- a/BasicRotations/Ranged/MCH_Beta.cs
+++ b/BasicRotations/Ranged/MCH_Beta.cs
@@ -72,7 +72,10 @@ protected override bool AttackAbility(out IAction? act)
             }
         }
 
-        if (!CombatElapsedLess(12) && CanUseHyperchargePvE(out act)) return true;
+        if (!WildfirePvE.Cooldown.WillHaveOneCharge(30))
+        {
+            return (CanUseHyperchargePvE(out act));
+        }
         if (CanUseRookAutoturretPvE(out act)) return true;
 
         if (BarrelStabilizerPvE.CanUse(out act)) return true;
@@ -138,27 +141,36 @@ private bool CanUseRookAutoturretPvE(out IAction? act)
 
 
     // Logic for Hypercharge
-    const float REST_TIME = 6f;
     private bool CanUseHyperchargePvE(out IAction? act)
     {
-        act = null;
-
-        // Checks if AOE is false and at least 12 seconds of combat has elapsed
-        if (!SpreadShotPvE.CanUse(out _) && !CombatElapsedLess(12) &&
-            // AirAnchor Charge Detection
-            ((AirAnchorPvE.EnoughLevel && AirAnchorPvE.Cooldown.WillHaveOneCharge(REST_TIME)) ||
-             // HotShot Charge Detection
-             (!AirAnchorPvE.EnoughLevel && HotShotPvE.EnoughLevel && HotShotPvE.Cooldown.WillHaveOneCharge(REST_TIME))) ||
-             // Drill Charge Detection
-             (DrillPvE.EnoughLevel && DrillPvE.Cooldown.WillHaveOneCharge(REST_TIME)) ||
-             // Chainsaw Charge Detection
-             (ChainSawPvE.EnoughLevel && ChainSawPvE.Cooldown.WillHaveOneCharge(REST_TIME)))
+        float REST_TIME = 6f;
+        if
+                     //Cannot AOE
+                     ((!SpreadShotPvE.CanUse(out _))
+                     &&
+                     //Combat elapsed 12 seconds
+                     (!CombatElapsedLess(12))
+                     &&
+                     // AirAnchor Enough Level % AirAnchor 
+                     ((AirAnchorPvE.EnoughLevel && AirAnchorPvE.Cooldown.WillHaveOneCharge(REST_TIME))
+                     ||
+                     // HotShot Charge Detection
+                     (!AirAnchorPvE.EnoughLevel && HotShotPvE.EnoughLevel && HotShotPvE.Cooldown.WillHaveOneCharge(REST_TIME))
+                     ||
+                     // Drill Charge Detection
+                     (DrillPvE.EnoughLevel && DrillPvE.Cooldown.WillHaveOneCharge(REST_TIME))
+                     ||
+                     // Chainsaw Charge Detection
+                     (ChainSawPvE.EnoughLevel && ChainSawPvE.Cooldown.WillHaveOneCharge(REST_TIME))))
         {
+            act = null;
             return false;
         }
-
-        // Use Hypercharge
-        return HyperchargePvE.CanUse(out act);
+        else
+        {
+            // Use Hypercharge
+            return HyperchargePvE.CanUse(out act);
+        }
     }
 
     #endregion
diff --git a/Directory.Build.props b/Directory.Build.props
index 576d4d4..91df7ca 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net8.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>LTS</Authors>
-		<Version>6.5.8.22</Version>
+		<Version>6.5.8.28</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 		<Nullable>enable</Nullable>