Major design rehaul