TEMPORARY REFACTOR XML