8/9 clinet & server modify