updated refactoring for new_users, #355