Flume re work (11/27)

Flume re work