Node1 improvements