Added more channel stuff