Added Chitra's modifications