Changed to list comprehension, plus ability to work with lists