just changed few things yet pending