added map changing