added reroute stuff