Major overhaul, and more to come