updated for map view