Trying to improve on the witness searcher.