Feat/user reroute