more changes for client/server