Sorted some routing