Corrected XML based on comments