Changing to a more modular design