Continue major overhaul