Updated for comprehensions draft