updated PR with review comments