Map.cs update and problem maybe solved