Merge with Naimish's changes