Changes made by swapnil in commit