Improved channel changing