changed User model