Use 'map' instead of 'each'