changed the map() syntax a bit