added some slick list comprehensions