Shahzeb's changes
main xml changes