Merged with Naimish's change