moved some code into MAPCollector