Changes for live mode