reset cmds, refactoring of user resolution