diff --git a/BossMod/Autorotation/Standard/akechi/AkechiTools.cs b/BossMod/Autorotation/Standard/akechi/AkechiTools.cs
index 2ea4d6e9c..8427c7882 100644
--- a/BossMod/Autorotation/Standard/akechi/AkechiTools.cs
+++ b/BossMod/Autorotation/Standard/akechi/AkechiTools.cs
@@ -839,7 +839,7 @@ protected bool CanWeave(AID aid, int extraGCDs = 0, float extraFixedDelay = 0)
     /// </summary>
     /// <param name="track">The user's picked strategy's option <b>Track</b>, retrieved from module's enums and definitions. (e.g. <b>strategy.Option(Track.NoMercy)</b>)</param>
     /// <returns></returns>
-    protected Actor? TargetChoice(StrategyValues.OptionRef track) => ResolveTargetOverride(track.Value); //Resolves the target choice based on the strategy
+    protected Actor? TargetChoice(StrategyValues.OptionRef track) => ResolveTargetOverride(track.Value);
 
     /// <summary>Targeting function for indicating when or not <b>AOE Circle</b> abilities should be used based on targets nearby.</summary>
     /// <param name="range">The range of the <b>AOE Circle</b> ability, or radius from center of Player; this should be adjusted accordingly to user's module specific to job's abilities.</param>
diff --git a/BossMod/Autorotation/Standard/akechi/Tank/AkechiDRK.cs b/BossMod/Autorotation/Standard/akechi/Tank/AkechiDRK.cs
index bdea2bc8f..e24f4536b 100644
--- a/BossMod/Autorotation/Standard/akechi/Tank/AkechiDRK.cs
+++ b/BossMod/Autorotation/Standard/akechi/Tank/AkechiDRK.cs
@@ -387,12 +387,12 @@ bloodStrat is BloodStrategy.ForceQuietus ? GCDPriority.ForcedGCD
 
         #region AI
         var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
-        var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
+        var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
         var goal = strategy.Option(SharedTrack.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
         {
             AOEStrategy.ForceST => goalST, //if forced single target
             AOEStrategy.ForceAOE => goalAOE, //if forced AOE
-            _ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
+            _ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
         };
         if (goal != null) //if goal is set
             Hints.GoalZones.Add(goal); //add goal to zones
diff --git a/BossMod/Autorotation/Standard/akechi/Tank/AkechiGNB.cs b/BossMod/Autorotation/Standard/akechi/Tank/AkechiGNB.cs
index 526f5d555..af03a1538 100644
--- a/BossMod/Autorotation/Standard/akechi/Tank/AkechiGNB.cs
+++ b/BossMod/Autorotation/Standard/akechi/Tank/AkechiGNB.cs
@@ -459,14 +459,14 @@ reignStrat is ReignStrategy.ForceLion
 
         #region AI
         var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
-        var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
-        var goal = AOEStrategy switch //Set goal based on AOE strategy
+        var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
+        var goal = strategy.Option(Track.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
         {
+            AOEStrategy.ForceSTwithO => goalST, //if forced single target
             AOEStrategy.ForceSTwithoutO => goalST, //if forced single target
-            AOEStrategy.ForceSTwithO => goalST, //if forced 123 combo
-            AOEStrategy.ForceAOEwithoutO => goalAOE, //if forced buffs combo
-            AOEStrategy.ForceAOEwithO => goalAOE, //if forced AOE action
-            _ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
+            AOEStrategy.ForceAOEwithO => goalAOE, //if forced single target
+            AOEStrategy.ForceAOEwithoutO => goalAOE, //if forced single target
+            _ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
         };
         if (goal != null) //if goal is set
             Hints.GoalZones.Add(goal); //add goal to zones
diff --git a/BossMod/Autorotation/Standard/akechi/Tank/AkechiPLD.cs b/BossMod/Autorotation/Standard/akechi/Tank/AkechiPLD.cs
index 1ce563afb..d3e671a9b 100644
--- a/BossMod/Autorotation/Standard/akechi/Tank/AkechiPLD.cs
+++ b/BossMod/Autorotation/Standard/akechi/Tank/AkechiPLD.cs
@@ -386,12 +386,12 @@ gbStrat is GCDStrategy.Force
 
         #region AI
         var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
-        var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
+        var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
         var goal = strategy.Option(Track.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
         {
             AOEStrategy.ForceST => goalST, //if forced single target
-            AOEStrategy.ForceAOE => goalAOE, //if forced AOE
-            _ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
+            AOEStrategy.ForceAOE => goalAOE, //if forced single target
+            _ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
         };
         if (goal != null) //if goal is set
             Hints.GoalZones.Add(goal); //add goal to zones
diff --git a/BossMod/Autorotation/Standard/akechi/Tank/AkechiWAR.cs b/BossMod/Autorotation/Standard/akechi/Tank/AkechiWAR.cs
index 6c4431b19..0c7189b4f 100644
--- a/BossMod/Autorotation/Standard/akechi/Tank/AkechiWAR.cs
+++ b/BossMod/Autorotation/Standard/akechi/Tank/AkechiWAR.cs
@@ -490,12 +490,12 @@ bgStrat is GaugeStrategy.ForceAOE
 
         #region AI
         var goalST = primaryTarget?.Actor != null ? Hints.GoalSingleTarget(primaryTarget!.Actor, 3) : null; //Set goal for single target
-        var goalAOE = primaryTarget?.Actor != null ? Hints.GoalAOECircle(5) : null; //Set goal for AOE
+        var goalAOE = Hints.GoalAOECircle(3); //Set goal for AOE
         var goal = strategy.Option(SharedTrack.AOE).As<AOEStrategy>() switch //Set goal based on AOE strategy
         {
             AOEStrategy.ForceST => goalST, //if forced single target
             AOEStrategy.ForceAOE => goalAOE, //if forced AOE
-            _ => goalST != null && goalAOE != null ? Hints.GoalCombined(goalST, goalAOE, 2) : goalAOE //otherwise, combine goals
+            _ => goalST != null ? Hints.GoalCombined(goalST, goalAOE, 3) : goalAOE //otherwise, combine goals
         };
         if (goal != null) //if goal is set
             Hints.GoalZones.Add(goal); //add goal to zones