ChannelsController modified a little