Flume re work (23/27)

Flume re work