Working on the new generator