working in the mapping functions again