Changing way we deal with redirects