Added slight updates to new generator.