modify 2 by zhangjian