slight changes to routing