Comments, changed xml structure