update user class to work with Hunters code
trying to fix merge conflict