Reworked redirection