Final push

Applied the change to video and audio