diff --git a/Assets/Scripts/Handler/TooltipHandler.cs b/Assets/Scripts/Handler/TooltipHandler.cs
deleted file mode 100644
index fb191a5..0000000
--- a/Assets/Scripts/Handler/TooltipHandler.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
-using Assets.Scripts.Player;
-
-namespace Assets.Scripts
-{
-    public class TooltipHandler : MonoBehaviour
-    {
-        public GameObject tooltip;
-        PlayerGameObject player;
-        UIHandler uihandler;
-
-        // Start is called before the first frame update
-        void Start()
-        {
-            player = GameObject.Find("Player").GetComponent<PlayerGameObject>();
-            uihandler = GameObject.Find("UIHandler").GetComponent<UIHandler>();
-        }
-
-        // Update is called once per frame
-        void Update()
-        {
-
-        }
-
-        public void showTooltip(string text)
-        {
-            tooltip.transform.Find("txtTooltip").GetComponent<Text>().text = text;
-            tooltip.transform.localScale = new Vector3(1,1,1);
-        }
-
-        public void hideToolTip()
-        {
-            tooltip.transform.localScale = new Vector3(0,0,0);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Handler/TooltipHandler.cs.meta b/Assets/Scripts/Handler/TooltipHandler.cs.meta
deleted file mode 100644
index 8ac774b..0000000
--- a/Assets/Scripts/Handler/TooltipHandler.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ff63195da43e3a145abba1304336b467
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs
index 6bd7d20..dc90dfa 100644
--- a/Assets/Scripts/Handler/UIHandler.cs
+++ b/Assets/Scripts/Handler/UIHandler.cs
@@ -22,7 +22,6 @@ namespace Assets.Scripts
         public GameObject playerHUD;
         public GameObject questlog;
         public GameObject introduction;
-        public GameObject tooltip;
         public GameObject tutorial;
         public GameObject inventory;
         public GameObject waterLayer;
diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs
index 98e9ae6..23f4340 100644
--- a/Assets/Scripts/Inventory.cs
+++ b/Assets/Scripts/Inventory.cs
@@ -26,15 +26,12 @@ namespace Assets.Scripts
 
         public int currentBag = -1;
 
-        TooltipHandler tooltip;
-
         public GameObject currentSlot;
 
         // Start is called before the first frame update
         void Start()
         {
             createStatBoost();
-            tooltip = GameObject.Find("TooltipHandler").GetComponent<TooltipHandler>();
             itemDisplay.transform.localScale = new Vector3(0,0,0);
             changeCurrentBag(0);
         }
diff --git a/Assets/Scripts/InventorySlot.cs b/Assets/Scripts/InventorySlot.cs
index bcd72dd..a80608c 100644
--- a/Assets/Scripts/InventorySlot.cs
+++ b/Assets/Scripts/InventorySlot.cs
@@ -10,7 +10,6 @@ namespace Assets.Scripts
 {
     public class InventorySlot : MonoBehaviour
     {
-        TooltipHandler tooltip;
         Item[] items = new Item[3];
         int currentBag = 0;
         public ItemPlace place;
@@ -19,7 +18,6 @@ namespace Assets.Scripts
 
         private void Start()
         {
-            tooltip = GameObject.Find("TooltipHandler").GetComponent<TooltipHandler>();
             inventory = GameObject.Find("Inventory").GetComponent<Inventory>();
             loadImages();
         }
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 59a719b..8c05ffe 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -9,16 +9,16 @@ EditorUserSettings:
       value: 05550c040100590e5c0c097446220f164e164d732a7072682c2a1f31b7b7666c
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d
-      flags: 0
-    RecentlyUsedSceneGuid-2:
       value: 0503045757070c095e0b087612765b40474f4979757d24647c71496ae7b8313e
       flags: 0
+    RecentlyUsedSceneGuid-2:
+      value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d
+      flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
diff --git a/save.json b/save.json
index 3193938..a823dd0 100644
--- a/save.json
+++ b/save.json
@@ -14,7 +14,6 @@
 "race": "Human",
 "role": "Warrior",
 "points": 0,
-"healthRegen": 30,
 "secondaryRegen": 5,
 "isDodging": "False",
 "killcount": 0,
@@ -24,7 +23,7 @@
 "world": {
 "cityAmount": 5,
 "maxCityAmount": 5,
-"currentTile": "0/0/-1",
+"currentTile": "0/0/0",
 "map": {
 "tile0": "./save/tile0.json",
 "tile1": "./save/tile1.json",
@@ -34,10 +33,7 @@
 "tile5": "./save/tile5.json",
 "tile6": "./save/tile6.json",
 "tile7": "./save/tile7.json",
-"tile8": "./save/tile8.json",
-"tile9": "./save/tile9.json",
-"tile10": "./save/tile10.json",
-"tile11": "./save/tile11.json"
+"tile8": "./save/tile8.json"
 }
 },
 "inventory": {
@@ -57,7 +53,11 @@
 "itemName": "Wood",
 
 },
-"bag2": "empty",
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot1": {
@@ -66,7 +66,11 @@
 "itemName": "Wood",
 
 },
-"bag2": "empty",
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot2": {
@@ -75,7 +79,11 @@
 "itemName": "Wood",
 
 },
-"bag2": "empty",
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot3": {
@@ -84,7 +92,11 @@
 "itemName": "Wood",
 
 },
-"bag2": "empty",
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot4": {
@@ -93,71 +105,147 @@
 "itemName": "Wood",
 
 },
-"bag2": "empty",
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot5": {
-"bag1": "empty",
-"bag2": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot6": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot7": {
-"bag1": "empty",
-"bag2": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot8": {
-"bag1": "empty",
-"bag2": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot9": {
-"bag1": "empty",
-"bag2": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot10": {
-"bag1": "empty",
-"bag2": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
+"bag2": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag3": "empty"
 },
 "slot11": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot12": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot13": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot14": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot15": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot16": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 },
 "slot17": {
-"bag1": "empty",
+"bag1": {
+"rarity": "COMMON",
+"itemName": "Wood",
+
+},
 "bag2": "empty",
 "bag3": "empty"
 }