GuoHuai and Fix XingWU