actually doing the redirects right this time