refactored and changed user related things