Sushant's changes