Second commit of media
Full fix