updates in light of adding 'channel' support to c-sharp
updates in light of adding 'channel' support to c-sharp - 2