changing to modular