Refactoring redirects
More fixes to redirects
3.5 release