edit methods for Users
merge master