better inclusion of the TS in Fluid