adjustments for new routing era