Changes Done

Lets review it and let me know the changes.