Overhaul to site version