updated to reflect new module features