Working on new Generator