incorporate HeavyWater changes