diff --git a/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim b/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim
new file mode 100644
index 0000000..600f276
--- /dev/null
+++ b/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim
@@ -0,0 +1,179 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BattleUnitIconCooldown
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.2784314
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 0.05490196
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3
+        value: 0.2784314
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: Image
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Image (2)
+    classID: 1
+    script: {fileID: 0}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 83635035
+      attribute: 304273561
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2409291885
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 3
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.2784314
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.5
+        value: 0.05490196
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 3
+        value: 0.2784314
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: Image
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: Image (2)
+    classID: 1
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim.meta b/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim.meta
new file mode 100644
index 0000000..25d69c9
--- /dev/null
+++ b/Assets/GWConquest/Animations/BattleUnitIconCooldown.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d26229c01b4adf41a53018497039bf3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/GWConquest/Prefabs/BattleUnitIcon.prefab b/Assets/GWConquest/Prefabs/BattleUnitIcon.prefab
index 3bb4e0f..a2a3574 100644
--- a/Assets/GWConquest/Prefabs/BattleUnitIcon.prefab
+++ b/Assets/GWConquest/Prefabs/BattleUnitIcon.prefab
@@ -105,7 +105,7 @@ RectTransform:
   - {fileID: 1619096850538365564}
   - {fileID: 1619096849984119125}
   m_Father: {fileID: 1687732570946376589}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -227,6 +227,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 1395217871626499769}
   - {fileID: 914397066647810572}
   - {fileID: 1687732571317619598}
   - {fileID: 1619096850430010799}
@@ -291,6 +292,7 @@ MonoBehaviour:
   IconImage: {fileID: 1687732571317619599}
   HealthBarGO: {fileID: 1619096850430010796}
   HealthBar: {fileID: 1619096849984119124}
+  CooldownCircle: {fileID: 3539772687376827173}
   healthyColor: {r: 1, g: 1, b: 1, a: 0.8784314}
   mediumColor: {r: 1, g: 0.7411765, b: 0, a: 0.8784314}
   criticalColor: {r: 0.8980392, g: 0.15686275, b: 0.15686275, a: 0.8784314}
@@ -410,7 +412,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1687732570946376589}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -484,7 +486,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1687732570946376589}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -528,6 +530,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1.25
+--- !u!1 &4066767880454868780
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1395217871626499769}
+  - component: {fileID: 3324867135700481420}
+  - component: {fileID: 3539772687376827173}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1395217871626499769
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4066767880454868780}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1687732570946376589}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3324867135700481420
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4066767880454868780}
+  m_CullTransparentMesh: 0
+--- !u!114 &3539772687376827173
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4066767880454868780}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3301887, g: 0.3301887, b: 0.3301887, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5096028343998011359
 GameObject:
   m_ObjectHideFlags: 0
@@ -558,7 +634,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1687732570946376589}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity
index 7dafd30..2bbcda1 100644
--- a/Assets/GWConquest/Scenes/GalaxyMap.unity
+++ b/Assets/GWConquest/Scenes/GalaxyMap.unity
@@ -24806,6 +24806,8 @@ MonoBehaviour:
   GroundTransitionLengthFactor: 30
   SpaceTransitionLengthFactor: 1
   BattleTurnLength: 30
+  MoveToFlankCooldown: 15
+  MoveToReserveCooldown: 15
   SpawnAIPlayer: 1
 --- !u!4 &426309784
 Transform:
diff --git a/Assets/GWConquest/Scripts/Battle.cs b/Assets/GWConquest/Scripts/Battle.cs
index 10d3587..c19d21d 100644
--- a/Assets/GWConquest/Scripts/Battle.cs
+++ b/Assets/GWConquest/Scripts/Battle.cs
@@ -204,7 +204,7 @@ namespace GWConquest
 
             if(hasChanges)
             {
-                SetUIDirty();
+                //SetUIDirty();
             }
             
         }
@@ -282,10 +282,12 @@ namespace GWConquest
             else {
                 BoltLog.Info("Moving unit {0} to flank index {1} on flank {2}", unit, flankIndex, flank);
 
-                unit.BattleState = BattleUnitState.OnFlank;
+                unit.BattleState = BattleUnitState.MovingToFlank;
+                float movement = unit.Class.Movement <= 0 ? 1f : unit.Class.Movement;
+                unit.SetActionCooldown(GameManager.Instance.MoveToFlankCooldown / movement);
                 flank.SetUnit(flankIndex, unit);
 
-                SetUIDirty(updatePositions: true);
+                //SetUIDirty(updatePositions: true);
             }
         }
 
diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs
index a52806a..dffeadf 100644
--- a/Assets/GWConquest/Scripts/GameManager.cs
+++ b/Assets/GWConquest/Scripts/GameManager.cs
@@ -14,6 +14,9 @@ namespace GWConquest
 
         public float BattleTurnLength;
 
+        public float MoveToFlankCooldown;
+        public float MoveToReserveCooldown;
+
         public bool SpawnAIPlayer;
 
         private static GameManager _instance;
diff --git a/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs b/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs
index 7e2dbc5..a2b12e1 100644
--- a/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleFormationUI.cs
@@ -90,7 +90,6 @@ namespace GWConquest {
             rt.sizeDelta = new Vector2(0, CurrentHeight);
 
             IconTransform.ForceUpdateRectTransforms();
-            Debug.Log(IconTransform.rect);
             float width = IconTransform.rect.width;
 
 
diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs
index 545c6d4..3b856a5 100644
--- a/Assets/GWConquest/Scripts/UI/BattleUI.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs
@@ -28,6 +28,14 @@ namespace GWConquest {
             //float uiWidth = FlankUIs[0].RectTransform.rect.width;
 
             float x = rect.width/4;
+
+            foreach(var ui in FlankUIs)
+            {
+                if(ui != null)
+                {
+                    Destroy(ui.gameObject);
+                }
+            }
             
 
             FlankUIs = new BattleFlankUI[Battle.FlankCount];
@@ -82,5 +90,11 @@ namespace GWConquest {
             }
         }
 
+        private void Update()
+        {
+            UpdateFormations();
+            UpdateIcons();
+        }
+
     }
 }
\ No newline at end of file
diff --git a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
index 1b492e9..a2be9ad 100644
--- a/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
@@ -9,6 +9,8 @@ namespace GWConquest {
         public GameObject HealthBarGO;
         public Image HealthBar;
 
+        public Image CooldownCircle;
+
         public Color healthyColor;
         public Color mediumColor;
         public Color criticalColor;
@@ -22,7 +24,7 @@ namespace GWConquest {
 
         public static int Compare(Unit a, Unit b)
         {
-            return (int) (a.entity.NetworkId.PackedValue - b.entity.NetworkId.PackedValue);
+            return System.Math.Sign((long)a.entity.NetworkId.PackedValue - (long)b.entity.NetworkId.PackedValue);
         }
 
         public void OnRemove()
@@ -76,6 +78,15 @@ namespace GWConquest {
             else {
                 HealthBarGO.SetActive(false);
             }
+
+            if(Unit != null && Unit.ActionCooldown > 0)
+            {
+                GetComponent<Animator>().SetBool("Cooldown", true);
+                CooldownCircle.fillAmount = Unit.ActionCooldownPercent;
+            }
+            else {
+                GetComponent<Animator>().SetBool("Cooldown", false);
+            }
         }
 
         public void PlayHitAnim()
diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs
index 1aca667..58022fd 100644
--- a/Assets/GWConquest/Scripts/Unit.cs
+++ b/Assets/GWConquest/Scripts/Unit.cs
@@ -49,6 +49,20 @@ namespace GWConquest
             set => state.RevealState = (int) value;
         }
 
+        public float ActionCooldown {
+            get => state.ActionCooldown;
+        }
+
+        public float ActionCooldownPercent {
+            get => state.ActionCooldown / state.ActionCooldownMax;
+        }
+
+        public void SetActionCooldown(float value)
+        {
+            state.ActionCooldown = value;
+            state.ActionCooldownMax = value;
+        }
+
         [System.NonSerialized]
         public BattleUnitIcon CurrentIcon;
 
@@ -98,6 +112,28 @@ namespace GWConquest
             }
         }
 
+        public override void SimulateOwner()
+        {
+
+            if (ActionCooldown <= 0)
+            {
+                state.ActionCooldown = 0;
+                if (BattleState == BattleUnitState.MovingToFlank)
+                {
+                    BattleState = BattleUnitState.OnFlank;
+                }
+            }
+            else
+            {
+                state.ActionCooldown -= BoltNetwork.FrameDeltaTime;
+            }
+
+        }
+
+
+
+
+
         
 
 
diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs
index 7fa3a9c..315466d 100644
--- a/Assets/GWConquest/Scripts/UnitClass.cs
+++ b/Assets/GWConquest/Scripts/UnitClass.cs
@@ -109,7 +109,7 @@ namespace GWConquest
                     unitClass.Description = data.GetString("Description");
 
                     unitClass.ZoneType = zoneType;
-                    unitClass.UnitStrength = unitClass.BuildCost.CreditCost / 100f;
+                    unitClass.UnitStrength = unitClass.Hitpoints;
 
                     unitClass.LoadTexture();
 
diff --git a/Assets/GWConquest/Textures/Effects/Explosion 04/BattleUnitIcon.controller b/Assets/GWConquest/Textures/Effects/Explosion 04/BattleUnitIcon.controller
index 3cd7f5d..ed4e763 100644
--- a/Assets/GWConquest/Textures/Effects/Explosion 04/BattleUnitIcon.controller	
+++ b/Assets/GWConquest/Textures/Effects/Explosion 04/BattleUnitIcon.controller	
@@ -95,6 +95,32 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -3473988378507739373}
+--- !u!1102 &-5974080155459450930
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BattleUnitIconCooldown
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 1d26229c01b4adf41a53018497039bf3, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-5192770744076417575
 AnimatorState:
   serializedVersion: 5
@@ -133,6 +159,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 1
     m_ConditionEvent: Selected
     m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: Cooldown
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: -7510945341723090009}
   m_Solo: 0
@@ -174,6 +203,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-2993259008258290879
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Cooldown
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5974080155459450930}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 0
 --- !u!1101 &-2470082344895030121
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -188,6 +242,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 2
     m_ConditionEvent: Selected
     m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: Cooldown
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 4230381212576871578}
   m_Solo: 0
@@ -242,19 +299,25 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Highlight
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Selected
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: Cooldown
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Highlight
@@ -294,6 +357,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 2
     m_ConditionEvent: Selected
     m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: Cooldown
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 3856284254593435620}
   m_Solo: 0
@@ -371,18 +437,22 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 4230381212576871578}
-    m_Position: {x: 450, y: -80, z: 0}
+    m_Position: {x: 410, y: -70, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 3856284254593435620}
-    m_Position: {x: 430, y: 50, z: 0}
+    m_Position: {x: 410, y: 10, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -7510945341723090009}
-    m_Position: {x: 430, y: 150, z: 0}
+    m_Position: {x: 410, y: 90, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -5974080155459450930}
+    m_Position: {x: 430, y: 160, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: -2470082344895030121}
   - {fileID: -3555006685556019414}
   - {fileID: 1063982034642607716}
+  - {fileID: -2993259008258290879}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll
index 4b6d84b..2c74c1e 100644
Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll differ
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb
index 2e98900..083f2af 100644
Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ
diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json
index a80518c..a797c7d 100644
--- a/Assets/Photon/PhotonBolt/project.json
+++ b/Assets/Photon/PhotonBolt/project.json
@@ -655,6 +655,58 @@
             "ExtrapolationMaxFrames": 9,
             "SnapMagnitude": 10.0
           }
+        },
+        {
+          "Name": "ActionCooldown",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeFloat, bolt.compiler",
+            "Compression": {
+              "MinValue": -2048,
+              "MaxValue": 2048,
+              "Accuracy": 0.01,
+              "Pack": 100.0,
+              "Read": 0.01,
+              "Shift": 2048.0,
+              "BitsRequired": 19
+            }
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        },
+        {
+          "Name": "ActionCooldownMax",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Bolt.Compiler.PropertyTypeFloat, bolt.compiler",
+            "Compression": {
+              "MinValue": -2048,
+              "MaxValue": 2048,
+              "Accuracy": 0.01,
+              "Pack": 100.0,
+              "Read": 0.01,
+              "Shift": 2048.0,
+              "BitsRequired": 19
+            }
+          },
+          "AssetSettings": {
+            "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
         }
       ],
       "PacketMaxBits": 512,