updated map functions1