polishing the mapper for Sandra