Everything is working except for re-routing