Reworking in a new module