merged the new generator.