changes from harsha
after merge