Refactoring, new Fluid system