Updated code to work with ss3.0.3