Updates based on comments.