WIP: more support for on the fly re-routing