Flume re work (16/27)

Flume re work