added following of users; refactoring