conventions changes
revising conventions
using 'yield_content'