changes in User.java