Flume re work (9/27)

Flume re work