reorganized add/remove channels