Fixes to implementation, input for flow added