better route building as per issue #10