switching to modular design