Better node location