Update to formatting and content