improved routing organization