Update By Paresh

Hi MAulik, Pls accept these chagnes.