Initial work on fixing the complexity of user controller
Fixing merge conflict