Updated with Code changes from July 1 code review.