Added a pure server version for testing