Changed to list comprehensions