manage channel changes better