Flume re work (26/27)

Flume re work