Adding debug, flow