got rid of terrible hacks to deal with player media