Made changes suggested by Chirag
Changed the code according to the suggestions given by Chirag
Merged Priti,Shivangi and Saif's Code