simplify fangzhu, fix xingshang