Some structural changes, added node.