Additional changes based on reviewer comments.