Changed media to singleton (mostly)