cahnged user model and controlelr