try #2 @ cors
Refactoring routes again