Newer versions of video

More jazzy
Fixing conflicts