Switched to priority queues