Flume re work (12/27)

Flume re work