Updated for ss3