all the problems with user data fixed