added live-media handling