refactor for users new