better handle upgrades.