fluids interpolated now
merging files with my changes