Updated to contain paragraphs and list tags