actually change all the queue_node usage