diff --git a/Assets/Scipts/Map.cs b/Assets/Scipts/Map.cs
index daba4b4..a0e4ed2 100644
--- a/Assets/Scipts/Map.cs
+++ b/Assets/Scipts/Map.cs
@@ -5,6 +5,8 @@ using UnityEngine;
 public class Map : MonoBehaviour {
 
     GameObject LocalPlayer;
+    List<GameObject> Players = new List<GameObject>();
+
     public GameObject[] Tiles;
     public List<GameObject> Landmarks;
 
@@ -29,16 +31,21 @@ public class Map : MonoBehaviour {
     #region StartupFunctions
     private void Start()
     {
+        LocalPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer;
+        Players.Add(LocalPlayer);
+        foreach (GameObject curPlayer in Multiplayer.PlayersManager.Instance.RemotePlayers.Values)
+        {
+            Players.Add(curPlayer);
+        }        
         //GenerateMap();
         CreateDummys();
-        LocalPlayer = Multiplayer.PlayersManager.Instance.LocalPlayer;
 
     }
 
     //Create dummy players for the world wrapping
     void CreateDummys()
     {
-        List<GameObject> Players = new List<GameObject>();
+        
         foreach (GameObject Player in Players)
         {
             Player PS = Player.GetComponent<Player>();