Reorganized Chapter 2 solution