changed user model a bit