Worked on redirects a little