latest changes to the generator