Huge general overhaul