Overhaul nearly done