putting back custom timeouts
fixing redirection