I have posted another suggestion for chapter 3 with all the code changes, so this post can be disregarded.