updated and refactored for CREATE user