SS3 Upgrade

Upgraded this for SS3 a while back, Nathan just reminded me I should send you a pull request so here we go :)