new video stream approach
mergefix