UserContentController 70%
merge