Revised XML

From @timmmyboy