Removed forEach loop, now using map