Issue #6: Included the data flow rebuilding into the CPU back-end