Added a couple of more upgrades