OAS thing as of OAS 17 again