Here is updates for DS v.3