Refactored priority steering