more Chapter 6 working changes..