made it modular :-)