Added switch for live data