SS/S6 changes