fully converted to new XML format