wip updated routes