Use 'map' instead of 'collect'