switching to comprehensions