Some changes for OC