Fixing the routing. fixing in a TDD way.