adapted the neighbours as well