Updated for neighbors