incorporated Ying's comments