NodeLocation logic addd