Changes with upgrade to ST3