Updated code to ss3
Further ss3 updates