overhaul for live and download