1) Please reformat xml, so you keep original formatting (2 spaces 120 characters width)
2) I do not change original code (including testing code).