new router - phase #7