small changes to the modular system