Lots of upgrades