added yogesh's changes