Rewamp the generator