diff --git a/SwordNGun/Config/DefaultInput.ini b/SwordNGun/Config/DefaultInput.ini
index 30e67a8..99f9b09 100644
--- a/SwordNGun/Config/DefaultInput.ini
+++ b/SwordNGun/Config/DefaultInput.ini
@@ -123,14 +123,16 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Q)
 +ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=One)
 +ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Two)
-+ActionMappings=(ActionName="Attack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Top)
++ActionMappings=(ActionName="Attack",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left)
 +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
 +ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Right)
 +ActionMappings=(ActionName="Fire",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger)
-+ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Left)
-+ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
-+ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftShoulder)
-+ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder)
++ActionMappings=(ActionName="Reload",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightShoulder)
++ActionMappings=(ActionName="UseGadget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftShoulder)
++ActionMappings=(ActionName="CycleMeleeWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_DPad_Right)
++ActionMappings=(ActionName="CycleRangedWeapon",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_DPad_Left)
++ActionMappings=(ActionName="Aim",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton)
++ActionMappings=(ActionName="Aim",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
 +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W)
 +AxisMappings=(AxisName="MoveForward",Scale=-1.000000,Key=S)
 +AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D)
diff --git a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset
index 8f08a67..c424a91 100644
--- a/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/BP_Protagonist.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b6ec78025310ad90d655c0976d4399a63898db3655fe9d421e75361ca05a5b6
-size 167528
+oid sha256:ffdcedc3ba44c771fdfecd4e08aae249b1d870fd4a22a54ec0a92c01f1895e12
+size 171177
diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap
index 321afe0..a33a9ce 100644
--- a/SwordNGun/Content/Maps/Test.umap
+++ b/SwordNGun/Content/Maps/Test.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aeb18b3a35a9457bcd5cdc54d9f659365962244d0d0d66838e23ed86c5161d27
+oid sha256:41c4185755e312aae8805498ae386758aa2068067054b62bcd15011122591cec
 size 685766
diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset
index 9d5f26f..59df0c9 100644
--- a/SwordNGun/Content/Maps/Test_BuiltData.uasset
+++ b/SwordNGun/Content/Maps/Test_BuiltData.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18f7fdb8883e81388af29c35d8edbb972f49f192f2a9511e41dd6f680c6b94b4
+oid sha256:00b12ece10185c4f4bd339844e75af1d8e964c1b1bfcbc28f53b3e311de4a156
 size 2330061
diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp
index 8de784e..6e75099 100644
Binary files a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp and b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp differ
diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h
index 6800f19..48902a5 100644
Binary files a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h and b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h differ