More queueing updates
merge