refactored to use partials for new user