Refactored so both audio and video is automatic injection.