Add new channel info, and remove commented/disable code.