Updating CAS to match CV2