Changes based on comments.