changes based on PR comments
deleting mistake adds
one forgotten change
minor changes due to PR
Merge branch 'testing'