06 make it modular