Updated for Cascading Fluid compatibility.