new changes
fixed merge conflicts with users stuff
merge conflicts