Merged all work again done by khushbu