Revised scheme for handling upgrades.