addressed Yingyi's comments
6 files changed