various changes to the generator