Refactored WFCR code - mixed, different...