changes as per PR comments
2 files changed