Added Channels & Fixed Code