Priority queue scheme now working for all