Flume re work (7/27)

Flume re work