Updated to the new OM