redirects logic modified