Commit No. 151 - xml changes (major)