Here is updates for SS v.5