Another major overhaul. Nearly there.