Gaurav Mahajan Code changes