Updated self_interaction to properly order the queue.