Reworked the XML