Follow feedback comments.