code review for ritesh changes