changes to the xhtml for &