Refactored and completed redirects.