map2 again because not sure if committed it earlier