Version after refactoring dOCR