switch and other upgrades