rework oc again