Add two methods back used to setup channels