OC Updated for version 2.0