4 Commits (Fixing-CORS-crash)