Modified as per new changes in git