new router - phase #3