refactored redirects