More work on Upgrades