added lots of upgrades