Refactoring redirects
3.5 release