refactoring users....