updated to new version of User