update by zj 7 to 8