Added changes from Chapter 2 exercises