added partial client/server handling