update by Yeqing_Zheng 07.09