diff --git a/Assets/Prefabs/Hellephant.prefab b/Assets/Prefabs/Hellephant.prefab
index 6f250ab91cecf839432aeda9cf6c995a9e927cd0..4243db77d551fcad19b7f0df8c557d09a10876a8 100644
--- a/Assets/Prefabs/Hellephant.prefab
+++ b/Assets/Prefabs/Hellephant.prefab
@@ -9964,6 +9964,7 @@ GameObject:
   - component: {fileID: 8802119058509244977}
   - component: {fileID: 541386318179783918}
   - component: {fileID: 3206540533631135292}
+  - component: {fileID: -5648947702417071708}
   m_Layer: 7
   m_Name: Hellephant
   m_TagString: Enemy
@@ -10214,5 +10215,17 @@ MonoBehaviour:
   currentHealth: 0
   sinkSpeed: 2.5
   scoreValue: 10
-  goldValue: 50
   deathClip: {fileID: 8300000, guid: 8c615fd0429f34edf85539d70279360d, type: 3}
+  enemyGameObject: {fileID: 0}
+--- !u!114 &-5648947702417071708
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2595121811331454759}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ef51047be8b3604a9bfce8a7f09487e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
diff --git a/Assets/Prefabs/ZomBear.prefab b/Assets/Prefabs/ZomBear.prefab
index 13a87bf209404f158d619c75da06eb99cb5fc73b..89d0bc1310fbce2e56b03fe93b46ea0b57f821a1 100644
--- a/Assets/Prefabs/ZomBear.prefab
+++ b/Assets/Prefabs/ZomBear.prefab
@@ -18,6 +18,7 @@ GameObject:
   - component: {fileID: 681220014}
   - component: {fileID: 681220015}
   - component: {fileID: 681220016}
+  - component: {fileID: 2899489374588205076}
   m_Layer: 7
   m_Name: ZomBear
   m_TagString: Enemy
@@ -253,8 +254,8 @@ MonoBehaviour:
   currentHealth: 0
   sinkSpeed: 2.5
   scoreValue: 10
-  goldValue: 15
   deathClip: {fileID: 8300000, guid: 62366b8d2c37a49dca550841c741317f, type: 3}
+  enemyGameObject: {fileID: 0}
 --- !u!114 &681220016
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -269,6 +270,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   timeBetweenAttacks: 0.5
   attackDamage: 10
+--- !u!114 &2899489374588205076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ef51047be8b3604a9bfce8a7f09487e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &100002
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/ZomBunny.prefab b/Assets/Prefabs/ZomBunny.prefab
index d3eb738aa2d0e8a528eab4bbbf8cab7aae314a62..7325f22ac5c8fca94259c252188e98b99ad3dae3 100644
--- a/Assets/Prefabs/ZomBunny.prefab
+++ b/Assets/Prefabs/ZomBunny.prefab
@@ -105,6 +105,7 @@ GameObject:
   - component: {fileID: 1380597677}
   - component: {fileID: 1380597678}
   - component: {fileID: 1380597679}
+  - component: {fileID: 763698126874038500}
   m_Layer: 7
   m_Name: ZomBunny
   m_TagString: Enemy
@@ -340,8 +341,8 @@ MonoBehaviour:
   currentHealth: 0
   sinkSpeed: 2.5
   scoreValue: 10
-  goldValue: 15
   deathClip: {fileID: 8300000, guid: 1d3bfb9269f136947bf8ac164cace1ff, type: 3}
+  enemyGameObject: {fileID: 0}
 --- !u!114 &1380597679
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -356,6 +357,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   timeBetweenAttacks: 0.5
   attackDamage: 10
+--- !u!114 &763698126874038500
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100002}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ef51047be8b3604a9bfce8a7f09487e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &100004
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Managers/GoldManager.cs b/Assets/Scripts/Managers/GoldManager.cs
index 44b53a6c60fcff5c9a162165a54a78211efe3529..6e02787a317f17cc4644c067f06c00618b29b414 100644
--- a/Assets/Scripts/Managers/GoldManager.cs
+++ b/Assets/Scripts/Managers/GoldManager.cs
@@ -13,12 +13,13 @@ public class GoldManager : MonoBehaviour
     {
         // Set up the reference.
         text = GetComponent<Text>();
-        gold = StateManager.Instance.gold;
+        // gold = StateManager.Instance.gold;
     }
 
 
     void Update()
     {
+        // Debug.Log(gold);
         // Set the displayed text to be the word "gold" followed by the score value.
         if (CheatManager.Instance.motherlode)
         {
diff --git a/Assets/Scripts/Managers/StateManager.cs b/Assets/Scripts/Managers/StateManager.cs
index a6accde63d7f0568baed7099383d8c5f73ff0cfd..7279cd95697b770978cc425d7fe7f5a34e2956f5 100644
--- a/Assets/Scripts/Managers/StateManager.cs
+++ b/Assets/Scripts/Managers/StateManager.cs
@@ -86,8 +86,8 @@ public class StateManager : MonoBehaviour
             Quest = QuestManager.quest,
             WeaponString = JsonUtility.ToJson(weaponSave),
             ActivePet = activePet,
-            Gold = GoldManager.gold,
-            Score = ScoreManager.score
+            Gold = GoldManager.gold
+            // Score = ScoreManager.score
         };
 
         // PlayerPrefs.SetString("Name" + SaveId.saveId, playerName);
@@ -97,6 +97,7 @@ public class StateManager : MonoBehaviour
         // PlayerPrefs.SetString("pet" + SaveId.saveId, activePet);
 
         PlayerPrefs.SetString("Save" + SaveId.saveId, JsonUtility.ToJson(save));
+        Debug.Log("Save" + SaveId.saveId);
         Debug.Log(PlayerPrefs.GetString("Save" + SaveId.saveId));
         // Debug.Log(JsonUtility.ToJson(weaponSave));
         // Debug.Log(JsonUtility.FromJson<WeaponSave>(save.WeaponString));
@@ -116,6 +117,8 @@ public class StateManager : MonoBehaviour
 
     public Save GetSave(int id)
     {
+        Debug.Log("Load Save" + id);
+        Debug.Log(PlayerPrefs.GetString("Save" + id));
         if (!PlayerPrefs.HasKey("Save" + id))
         {
             return null;
@@ -153,7 +156,7 @@ public class StateManager : MonoBehaviour
         QuestManager.quest = save.Quest;
         activePet = save.ActivePet;
         GoldManager.gold = save.Gold;
-        ScoreManager.score = save.Score;
+        // ScoreManager.score = save.Score;
 
         if (save.Quest == 4)
         {
diff --git a/Assets/Scripts/save/Save.cs b/Assets/Scripts/save/Save.cs
index 815f9a24b7a33148240be547f05de1392c4772aa..c6e837ce0797cc74e4b2d32dc5bb2169b0c1278e 100644
--- a/Assets/Scripts/save/Save.cs
+++ b/Assets/Scripts/save/Save.cs
@@ -12,5 +12,5 @@ public class Save
     public string WeaponString;
     public string ActivePet;
     public int Gold;
-    public int Score;
+    // public int Score;
 }
diff --git a/Assets/Scripts/save/SaveHandler.cs b/Assets/Scripts/save/SaveHandler.cs
index 7d6f7eab28db5423d7178590af54ab1a67ceb31f..03b2b9dcd90f292776cf0f72ec71809ac172ed32 100644
--- a/Assets/Scripts/save/SaveHandler.cs
+++ b/Assets/Scripts/save/SaveHandler.cs
@@ -10,32 +10,29 @@ public class SaveHandler : MonoBehaviour
     private void Awake()
     {
         nameInput.text = "New Save " + SaveId.saveId;
-        nameInput.onEndEdit.AddListener(value =>
-        {
-            if (value.Length == 0 || value.ToLower() == "(empty slot)")
-            {
-                nameInput.Select();
-                nameInput.ActivateInputField();
-            }
-            else
-            {
-                SaveId.saveName = value;
-                SaveId.saveDate = System.DateTime.Now.ToString();
-                StateManager.Instance.Save();
-                Next();
-            }
-        });
+        nameInput.onEndEdit.AddListener(delegate { Next(); });
     }
 
     public void Next()
     {
-        if (QuestManager.quest == 2)
+        if (nameInput.text.Length == 0 || nameInput.text.ToLower() == "(empty slot)")
         {
-            SceneManager.LoadScene("Meeting ShopKeeper", LoadSceneMode.Single);
+            nameInput.Select();
+            nameInput.ActivateInputField();
         }
         else
         {
-            SceneManager.LoadScene("Shop", LoadSceneMode.Single);
+            SaveId.saveName = nameInput.text;
+            SaveId.saveDate = System.DateTime.Now.ToString();
+            StateManager.Instance.Save();
+            if (QuestManager.quest == 2)
+            {
+                SceneManager.LoadScene("Meeting ShopKeeper", LoadSceneMode.Single);
+            }
+            else
+            {
+                SceneManager.LoadScene("Shop", LoadSceneMode.Single);
+            }
         }
     }
 }