Upgraded to new generator