NoTask - updates following PR review