Moving redirection to non-main section to avoid unneeded cycles