Further updates for SS3