More work on redirect option.