Optimise the Witness table a bit