Rework zhe comments.