Flume re work (3/27)

Flume re work