added includes and more nested content