Refactored, working fluid rows