Make these 3 changes upgrades into one