Updates to redirection