Updated for new OMFraF workings.