Improve channel changing reliability