solution for make it modular