Improved redirector