refactoring
refactoring server