updated to match oF 074