I am doing changes mentioned in above comment.