tweak
make redirect optional