diff --git a/Assets/Prefab/For Map/1PlayerMarker.png b/Assets/Prefab/For Map/1PlayerMarker.png
index f1345748..1d75e7dd 100644
--- a/Assets/Prefab/For Map/1PlayerMarker.png	
+++ b/Assets/Prefab/For Map/1PlayerMarker.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30fd91bf70242997cf331358dd5197addd92d8fa2cb52a5c13e65e5a14737a88
-size 4488
+oid sha256:846f424f82fe51f19e440f43f5eafb5bff30ed76ebe8526228d7a9963b978df7
+size 73834
diff --git a/Assets/Prefab/For Map/1PlayerMarker.png.meta b/Assets/Prefab/For Map/1PlayerMarker.png.meta
index 1f72ebc9..4fee540b 100644
--- a/Assets/Prefab/For Map/1PlayerMarker.png.meta	
+++ b/Assets/Prefab/For Map/1PlayerMarker.png.meta	
@@ -93,19 +93,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
diff --git a/Assets/Prefab/For Map/2PlayerMarker.png b/Assets/Prefab/For Map/2PlayerMarker.png
index 9ba82404..8fae41d7 100644
--- a/Assets/Prefab/For Map/2PlayerMarker.png	
+++ b/Assets/Prefab/For Map/2PlayerMarker.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74660566a41f096105574fc641e13a7791ad3f6b585a98f830acf5770fdd89dd
-size 195878
+oid sha256:d3f47497cbe3239cf1c41bbdbc3c02467625c4d74c2270af03b45bb33210f414
+size 48094
diff --git a/Assets/Prefab/For Map/2PlayerMarker.png.meta b/Assets/Prefab/For Map/2PlayerMarker.png.meta
index 807e92bb..afa6b76e 100644
--- a/Assets/Prefab/For Map/2PlayerMarker.png.meta	
+++ b/Assets/Prefab/For Map/2PlayerMarker.png.meta	
@@ -93,19 +93,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
diff --git a/Assets/Prefab/For Map/Border.png b/Assets/Prefab/For Map/Border.png
deleted file mode 100644
index b2444986..00000000
--- a/Assets/Prefab/For Map/Border.png	
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:019bbdfba7bea27f525fda924228dad32ffc72f4b40b2b93fc7356b68975f393
-size 69415
diff --git a/Assets/Prefab/For Map/Map.prefab b/Assets/Prefab/For Map/Map.prefab
deleted file mode 100644
index 809d201a..00000000
Binary files a/Assets/Prefab/For Map/Map.prefab and /dev/null differ
diff --git a/Assets/Prefab/For Map/Map.prefab.meta b/Assets/Prefab/For Map/Map.prefab.meta
deleted file mode 100644
index 4e5c8caf..00000000
--- a/Assets/Prefab/For Map/Map.prefab.meta	
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8a4d6b8fd851383458c04b5ab0747147
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Prefab/For Map/Map-Photoroom.png-Photoroom.png b/Assets/Prefab/For Map/MapCustom.png
similarity index 100%
rename from Assets/Prefab/For Map/Map-Photoroom.png-Photoroom.png
rename to Assets/Prefab/For Map/MapCustom.png
diff --git a/Assets/Prefab/For Map/Map-Photoroom.png-Photoroom.png.meta b/Assets/Prefab/For Map/MapCustom.png.meta
similarity index 100%
rename from Assets/Prefab/For Map/Map-Photoroom.png-Photoroom.png.meta
rename to Assets/Prefab/For Map/MapCustom.png.meta
diff --git a/Assets/Prefab/For Map/MaskBasic.png b/Assets/Prefab/For Map/MaskBasic.png
new file mode 100644
index 00000000..c576e058
--- /dev/null
+++ b/Assets/Prefab/For Map/MaskBasic.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:360a3d2c3553ff9c2b928faa9f3e05d2026c75548187e23a9ebe804eab8dd101
+size 756044
diff --git a/Assets/Prefab/For Map/Border.png.meta b/Assets/Prefab/For Map/MaskBasic.png.meta
similarity index 89%
rename from Assets/Prefab/For Map/Border.png.meta
rename to Assets/Prefab/For Map/MaskBasic.png.meta
index c9ef1146..1dd56a6b 100644
--- a/Assets/Prefab/For Map/Border.png.meta	
+++ b/Assets/Prefab/For Map/MaskBasic.png.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 545207f531b8e424f95c3d5da8b62b3a
+guid: f9e02c69c1cf55840838e9f7f2c839c3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -93,19 +93,6 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
diff --git a/Assets/Prefab/For Map/MiniMap.prefab b/Assets/Prefab/For Map/MiniMap.prefab
deleted file mode 100644
index ddf22363..00000000
Binary files a/Assets/Prefab/For Map/MiniMap.prefab and /dev/null differ
diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity
index cb7354b0..dedc1e1e 100644
Binary files a/Assets/Scenes/GameScene.unity and b/Assets/Scenes/GameScene.unity differ
diff --git a/Assets/Prefab/For Map/MiniMap.prefab.meta b/Assets/Scripts/Map.meta
similarity index 57%
rename from Assets/Prefab/For Map/MiniMap.prefab.meta
rename to Assets/Scripts/Map.meta
index 120e3711..98eee93d 100644
--- a/Assets/Prefab/For Map/MiniMap.prefab.meta	
+++ b/Assets/Scripts/Map.meta
@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 98d51bd430fa57042baccfe371c9c062
-PrefabImporter:
+guid: 728eca47a6b4b7c42a8d4ffb8bd8a789
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Assets/Scripts/Map/FollowTarget.cs b/Assets/Scripts/Map/FollowTarget.cs
new file mode 100644
index 00000000..590a0554
--- /dev/null
+++ b/Assets/Scripts/Map/FollowTarget.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FollowTarget : MonoBehaviour
+{
+    [SerializeField] private Transform target;
+    [SerializeField] private  Vector3 offset;   
+
+    // Update is called once per frame
+    void Update()
+    {
+        transform.position = target.transform.position + offset;
+    }
+}
diff --git a/Assets/Scripts/Map/FollowTarget.cs.meta b/Assets/Scripts/Map/FollowTarget.cs.meta
new file mode 100644
index 00000000..7cb268ea
--- /dev/null
+++ b/Assets/Scripts/Map/FollowTarget.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20a3759cbc66e434499077641803d3c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Map/FollowYRotation.cs b/Assets/Scripts/Map/FollowYRotation.cs
new file mode 100644
index 00000000..9d6abc3f
--- /dev/null
+++ b/Assets/Scripts/Map/FollowYRotation.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FollowYRotation : MonoBehaviour
+{
+    [SerializeField] Transform target;
+
+    void Update()
+    {
+        transform.eulerAngles = new Vector3(0, target.eulerAngles.y, 0);
+    }
+}
diff --git a/Assets/Scripts/Map/FollowYRotation.cs.meta b/Assets/Scripts/Map/FollowYRotation.cs.meta
new file mode 100644
index 00000000..a549e64f
--- /dev/null
+++ b/Assets/Scripts/Map/FollowYRotation.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0d98ee0b2df87f4428f1f06361404b6a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
index 85c46f1f..dc001753 100644
Binary files a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset and b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset differ
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index e15419a5..f79e183a 100644
Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ