initial revision of faster node finding code