new mapper/reducer for 3.6