XML format changed according to comments