commit 3

3rd and final edit