work on the mapping