refactor and server works