Updated version for OC6