Changes to User.java