added self-closing tags