update to include high-water client