SRC 119914

changes based on code review.