added live data support