revamped redirects again