SS3.1 upgrade - basics