updated map and interaction