diff --git a/sku.0/sys.server/compiled/game/datatables/proc/proc.tab b/sku.0/sys.server/compiled/game/datatables/proc/proc.tab
index c8ba6e3dc..79c53915b 100755
--- a/sku.0/sys.server/compiled/game/datatables/proc/proc.tab
+++ b/sku.0/sys.server/compiled/game/datatables/proc/proc.tab
@@ -38,7 +38,7 @@ bh_armor_duelist_heal_3	100				expertise bounty hunter reactive heal
 bh_armor_duelist_heal_4	100				expertise bounty hunter reactive heal
 bh_armor_duelist_heal_5	100				expertise bounty hunter reactive heal
 expertise_fs_force_clarity_1_proc	5				Expertise to get a second attack
-expertise_fs_flurry_charge_proc	5				Expertise to charge up a Flurry charge
+expertise_fs_flurry_charge_proc	0				Expertise to charge up a Flurry charge- procChance set to 0 from 5 so it is effectively removed per GU 16.6
 expertise_sm_ranged_shot_proc	0				Expertise to get a second attack
 expertise_sm_melee_proc	0				Expertise to get a second attack
 expertise_sm_melee_stun_proc	0		"sm_melee_stun,sm_melee_stun_recourse"		Expertise to get a second attack that stuns
diff --git a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java
index 204b4e6c3..0c68e9545 100755
--- a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java
+++ b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java
@@ -1888,91 +1888,133 @@ public class combat_actions extends script.systems.combat.combat_base
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_1", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_1");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_flurry_2(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_2", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_2");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_flurry_3(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_3", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_3");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_flurry_4(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_4", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_4");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_flurry_5(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_5", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_5");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_flurry_6(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_6", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_6");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_flurry_7(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException
     {
         if (!buff.isInStance(self))
         {
+            sendSystemMessage(self, new string_id("spam", "fs_command_no_stance"));
             return SCRIPT_OVERRIDE;
         }
         if (!combatStandardAction("fs_flurry_7", self, target, params, "", ""))
         {
             return SCRIPT_OVERRIDE;
         }
-        buff.removeBuff(self, "jedi_reflect_flurry");
+        float baseCooldownTime = getBaseCooldownTime("fs_flurry_7");
+        if (baseCooldownTime < 0)
+        {
+            return SCRIPT_OVERRIDE;
+        }
+        setCommandTimerValue(self, TIMER_COOLDOWN, baseCooldownTime);
         return SCRIPT_CONTINUE;
     }
     public int fs_dm_1(obj_id self, obj_id target, String params, float defaultTime) throws InterruptedException