FailOk applied and "tested". Ready for merge.