Switched to non-deprecated fail/done