updated for map