changed rules for redirections