Improved modular design.