Upgrading syntax for SS3

Let me know if there's anything I missed.