added Corinna's changes and fixed her chapter 6