Tied up a bit the module.