More work on Upgrades.