multi-user bug fix
1
code refactoring