Changes from 18/8/13: Nitin
2nd group of changes 18/8/13