Updated to use map instead of collect