Changed to a more sensible routing pattern