Time for an overhaul?