More work done on Mapper 4