Addressed Yangqing's comments