Revert "Working OC/UC/UV"