Latest Code committed

Some design implementation and  changes in the code