More modularization and streamlining.