avoided use of the module() function and switched to the "no magic" module style.