@TimCliff's Updated Witness Application