Fluid handling update