Merging Pavitra's changes