6.3 - updated user model