Updated the generator