merging gauravs changes