Main oc - redesign