second commit by wangxinlu