Now handles existing nodes