Second update after review.