some major changes in design Not done