Nodeupdate rework 1/4