Changes after more comments.