Major overhaul, all as one model