Went back to the old queueing system