Working on the generator