Re-factored in support of node.