reverted some changes in content composition, I didnt like them