* renamed func to avoid ambigious names
* prepare for new rerouting algo