Added Channels; More modifications can be done