new map and rejiggered map data in scenarios to support 2nd layer