change all xml, correct xml implementation