Moved to super block solution without super block CFG