Merging Pavitra and Bhaven's changes