finally working -- work on redirect