Performance fix
Merge pull request #8 from mromniadev/LD-20-29-Edits-to-all-users

Performance fix