Flume re work (21/27)

Flume re work