Node2 + node3 improvements