updated and give up on OC support