perf/flow improvements