Update OC code, added governers