small changes to Manish's changes