Added & Fixed Channels