Flume re work (19/27)

Flume re work