incorporated Manish's comments