Added witnesses to the mix