Fundamental design changes