Updated for new channel events