overhaul of redirect mechanics