did some work on user model