changes to modular code