Redid XML and XSD with @ajl2612 and @jkugs