upgrade client version
refactor