Refactored to combine the map/concat into a collect.