Update from comments.