Flume re work (4/27)

Flume re work