move map functions around