updated to the new module style