some updates on User.java