Nodes working much better