Applying comments from PR #4