Added untested edit channel logic