Made it modular