updated parts of xml loading