fixed second round of comments from Yilong