Added Saahil's suggestions