new router - phase #4