Updated callSites to favor NewChannel3 (instead of calling NewChannel2)