Added Mahesh's suggestions