diff --git a/My project/Assets/Scenes/BossFight.unity b/My project/Assets/Scenes/BossFight.unity
index f2a025124b2ee72bbb897bcf0567c7299a678f39..94441860d6f36067ad1e1e7b195da5fabc5c90ac 100644
--- a/My project/Assets/Scenes/BossFight.unity	
+++ b/My project/Assets/Scenes/BossFight.unity	
@@ -3411,10 +3411,10 @@ MonoBehaviour:
     questObjectiveRequirement: 0
     reward: 0
   questUI: {fileID: 0}
-  titleText: {fileID: 0}
-  descText: {fileID: 0}
-  progressText: {fileID: 0}
-  rewardText: {fileID: 0}
+  titleText: {fileID: 1514187214}
+  descText: {fileID: 1556220132}
+  progressText: {fileID: 1522039171}
+  rewardText: {fileID: 1179400701}
 --- !u!4 &1140854478
 Transform:
   m_ObjectHideFlags: 0
diff --git a/My project/Assets/Scripts/Controllers/StateController.cs b/My project/Assets/Scripts/Controllers/StateController.cs
index e10271bfacef573b3da8ea0f875ae5e1c1819ec5..bb22e4dbb18da61ea1e0181e81efaab7493f1b49 100644
--- a/My project/Assets/Scripts/Controllers/StateController.cs	
+++ b/My project/Assets/Scripts/Controllers/StateController.cs	
@@ -52,9 +52,9 @@ public class StateController : MonoBehaviour
         ShopController.isShotgunBought = boughtSword;
         ShopController.isSwordBought = boughtSword;
         ShopController.isBowBought = boughtBow;
-        ShopController.isHealerBought = (petTag == 0);
-        ShopController.isAttackerBought = (petTag == 1);
-        ShopController.isBuffBought = (petTag == 2);
+        ShopController.isHealerBought = (petTag == 1);
+        ShopController.isAttackerBought = (petTag == 2);
+        ShopController.isBuffBought = (petTag == 0);
         ShopController.isShotgunUpgraded = (shotGunMultiplier != 1);
         ShopController.isSwordUpgraded = (swordMultiplier != 1);
         ShopController.isBowUpgraded = (bowMultiplier != 1);
diff --git a/My project/Assets/Scripts/Managers/GameOver.cs b/My project/Assets/Scripts/Managers/GameOver.cs
index 9c296cd81b21363a3f95cdc9dd84106957577238..4a1bc6463d550f8ad6d8dc2377cfc5d40ffa7ad3 100644
--- a/My project/Assets/Scripts/Managers/GameOver.cs	
+++ b/My project/Assets/Scripts/Managers/GameOver.cs	
@@ -36,6 +36,9 @@ public class GameOver : MonoBehaviour
         }
         if (restartTimer >= restartDelay)
         {
+            QuestManager qman = GameObject.Find("QuestManager").GetComponent<QuestManager>();
+            qman.currentQuest = qman.questList[0];
+            StateController.reset();
             SceneManager.LoadScene(0);
         }
     }
@@ -53,6 +56,8 @@ public class GameOver : MonoBehaviour
         if (StateController.slot == "0")
         {
             SceneManager.LoadScene(1);
+            QuestManager qman = GameObject.Find("QuestManager").GetComponent<QuestManager>();
+            qman.currentQuest = qman.questList[0];
             StateController.reset();
         }
         else
diff --git a/My project/Assets/Scripts/Weapon/Bow.cs b/My project/Assets/Scripts/Weapon/Bow.cs
index 1fb59467bd27327a1fa9fccecf484357b2338076..bf73ca2fcbe57440cb50ccf2212b0a3aeb3ca264 100644
--- a/My project/Assets/Scripts/Weapon/Bow.cs	
+++ b/My project/Assets/Scripts/Weapon/Bow.cs	
@@ -41,19 +41,19 @@ public class Bow : MonoBehaviour
     {
         if(!ShopController.isShopAccessed && !CheatController.isCheatEnabled){
 
-            if (Input.GetMouseButton(0))
+            if (Input.GetMouseButton(1))
             {
                 chargeSlider.value += Time.deltaTime * 40;
             }
 
-            if (Input.GetMouseButtonDown(0))
+            if (Input.GetMouseButtonDown(1))
             {
                 bowAudio.Play();
                 holdDownTime = Time.time;
                 chargeSlider.value += Time.deltaTime;
             }
             
-            if (Input.GetMouseButtonUp(0))
+            if (Input.GetMouseButtonUp(1))
             {
                 if (reloading || arrow == null) {
                     bowAudio.Stop();
diff --git a/README.md b/README.md
index 297f9c9769d73b6b70219b88d9aa35773b8f8236..dcd5a37c01f6ce82c8b7cad0f561971b44400958 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ NIM | Nama | Tugas | Jam Persiapan | Jam Pengerjaan
 --- | --- | --- | --- | ---
 13520021 | Gede Sumerta Yoga | inisialisasi game, pet |  |
 13520090 | Rahmat Rafid Akbar | Cheat, Main Menu, Game Over, Local Scoreboard, Bug Tester | 10 jam | 24 jam
-13520133 | Jevant Jedidia Augustine | Inisialisasi game, story mode, Save & Load |  |
+13520133 | Jevant Jedidia Augustine | Inisialisasi game, story mode, Save & Load, Integrasi | 10 jam | 36 jam
 13520141 | Yoseph Alexander Siregar | Shop, Bonus Upgrade Weapon | 5 jam | 9 jam
 13520143 | Muhammad Gerald Akbar Giffera | Weapon, Bonus Upgrade Weapon |  |