adopting swarm client to server version