Major overhaul, part one