Merged with changes by Dhruba and Naimish
Few fixes