Sudheer's changes