Should match up with changes in queue