merging changes done by Rajeewa