Messed around with the user view
Merge commit