much simpler redirect logic