Revamped OC/UC-OV/UV to more up-to-date