Flume re work (17/27)

Flume re work