More changes to save the User