Changes to the video handling