account for refactored core.