Include some more content; change nesting