Last of the routing changes for #194 thanks to @kcorman