Change delegates to real users
Merge branch 'develop'