updated map and controller