Keeping the flow on track