Flume re work (8/27)

Flume re work