Tightening pass on Flux