Working on Mapper 4 again.