Some modifications added