Revised for General AP/Router.