#2 New effects on table and in user
Merge branch 'feature/dd' into develop