completed changes based Blake's feedback from PR #104