Sphoorti's commit