Restored all old functionality with live data