Updated queuing system