diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
index 7218edc..12d5ebc 100644
--- a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
+++ b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs
@@ -481,8 +481,7 @@ namespace Unity.BossRoom.Gameplay.UserInput
 
         void Update()
         {
-            // Toggle Swap Mode with E key
-            if (Input.GetKeyDown(KeyCode.E))
+            if (Input.GetKeyDown(KeyCode.Q))
             {
                 if (!m_AbilitySystem.IsAbilityModeActive() && m_ServerCharacter.IsOnAPlatform && !m_ServerCharacter.IsCrow) // Prevent swap mode if ability mode is active
                 {
@@ -493,9 +492,8 @@ namespace Unity.BossRoom.Gameplay.UserInput
                     m_UIMessageFeed.DisplayMessage("Not on a platform or not a player");
                     Debug.Log("Cannot activate swap mode while ability mode is active.");
                 }
-            }
-            // Toggle Ability Mode with Q key
-            if (Input.GetKeyDown(KeyCode.Q))
+            } //Swap
+            if (Input.GetKeyDown(KeyCode.E)) //Dash'N'Crash
             {
                 if (!IsSwapModeActive) // Prevent ability mode if swap mode is active
                 {
@@ -514,8 +512,8 @@ namespace Unity.BossRoom.Gameplay.UserInput
                 {
                     Debug.Log("Cannot activate ability mode while swap mode is active.");
                 }
-            }
-            if (Input.GetKeyDown(KeyCode.R))
+            } 
+            if (Input.GetKeyDown(KeyCode.R)) //Freeze Throw
             {
                 if (!IsSwapModeActive) // Prevent ability mode if swap mode is active
                 {
@@ -527,7 +525,7 @@ namespace Unity.BossRoom.Gameplay.UserInput
                     Debug.Log("Cannot activate ability mode while swap mode is active.");
                 }
             }
-            if (Input.GetKeyDown(KeyCode.F))
+            if (Input.GetKeyDown(KeyCode.F)) //Vector Wall
             {
                 if (!IsSwapModeActive) // Prevent ability mode if swap mode is active
                 {
@@ -542,17 +540,13 @@ namespace Unity.BossRoom.Gameplay.UserInput
             if (m_AbilitySystem.IsAbilityModeActive()) return;
             if (!IsSwapModeActive) // Prevent other inputs if swap mode is active
             {
-                if (Input.GetMouseButtonDown(0))
+                if (Input.GetMouseButtonDown(1))
                 {
                     m_MoveRequest = true;
                 }
             }
             if (!EventSystem.current.IsPointerOverGameObject() && m_CurrentSkillInput == null)
             {
-                // if (Input.GetMouseButtonDown(1))
-                // {
-                //     RequestAction(CharacterClass.Skill1.ActionID, SkillTriggerStyle.MouseClick);
-                // }
                 if (IsSwapModeActive && Input.GetMouseButtonDown(0)) // Left-click to request swap
                 {
                     HandleSwapRequest();