changing the user structure
Merged conflicts