added mapp handling in steps 1,2,3