Get rid of @node_index