Updated Chapter 17 Non ARC version