fixup! Basic developing of data-flow