changes went well, routing is much better