Suhas's changes

merged suhas's code with mine