channel imporvements
merge