Flume re work (6/27)

Flume re work