Refactored audio and video, new media method added