Update generator, add first comprehension