Trying to merge map.cs