[131] refactoring clinet part;