changes from PR