commit from khushboo - 2