COMPLETED
trouble with mapper