integration with new server/ refactoring