Review the code to align with original ocf code