changes in User.php