Manish's changes