Modidifed by srivatsa now