Updated with the latest channel map.  And tweaked a bit.