reverted mike's changes in neighbors