update by Yeqin Zheng 07.09