Changed map() to list(map())