verification of #18, plus update Flow.initialize call