Waterworks Revised