serverData and refactoring