added channel iq
merge conflict fixes