fixed first part of chapter 2