updated for live