Update according to comments.