Some Adjustments 2 related to the redirection