Improve the way that we handle "upgrades".