Created the modular version