alter client and server interface to be the same