Adding updates to meet the last observations in the code review.