Changed the way the map works