ready for content, little bit refactored