more work on client/server