reworking CORS-related material