update by zj six