New changes for leaving queues