cross-origin-fixes + logic