rewrote some in neighbourlist