Adds the Buffer Search, again.