Make it modular completed
make it modular