Upgrade switch 2

Ooops... forgot a bunch of stuff!