added map switching