improvements to the module