added better redirections