Changes based on reviewer comments.