Remixes of "add oc 1"

Feedback