Reverting back to chap 7 changes ... chapter 8 is too buggy to continue