Map-reducer reworked.