3.5.7 XML + corrections