improved the way routes are dealt with a little bit