Fixed queue, changed terminology to more standard