Rerouting + demo polish