Updated following PR review