Updated for cleaner, more compatible videos