Added Amit's Changes