changes from PR discussion