commention and optimising
Merge branch 'users'