Flume re work (2/27)

Flume re work