partial user module
merge conflicts