add flow for witness