make oc, uc optional..add some code