quick fix against resource consuming
batch of flows issue
Initial commit
interim changes