done with the changes told by swapnil