Upgrades are now stackable