Use routing (10/18)

Use routing