Some flow retooling.