Make upgrades stackable. Half of #10