solution to 'make it modular'