added neighbours and tests