More work on upgrades