Improved redirection