new router - phase #6