refactored Routes