Switched from CORS solution to proxy