modified xmlparser a bit