Updated redirection strategy