changed router to new api