REFACTOR: Merged audio and video