some streamlined changes for redirecting