Added Madhu's changes