Add util.neighbour and do not activate/deactivate for simple call