made it more module like