added more cases to the witness finder