commit from deepaks branch