Attemp to get upgrades working properly