Fixed up for live setup