Changes done by swapnil at 9:40