Edit 4 on new branch

this is all about my elaborate pull request