Overhaul the rest