Make the Fluid stuff much better