Flume re work (10/27)

Flume re work