adding more updates for the mapper output fix