changes to server implementations