updated map functions