Flume re work (1/27)

Flume re work