Added new map and fixed map switching.