Added changes for redirection