updated media, has bugs