Add neighbor search check codes