edited some rerouting