Continuing the overhaul